diff --git a/Openstack/pv176-env.json b/Openstack/pv176-env.json index 935059ccb46e3e5588eb7abf7f860c7a35520174..812a64a7b3c4ac5b5b8b200edd93bdcc2df3f07b 100644 --- a/Openstack/pv176-env.json +++ b/Openstack/pv176-env.json @@ -1,6 +1,6 @@ { "resource_registry":{ - "Lib::private_network": "https://gitlab.ics.muni.cz/396462/PV176/raw/master/Openstack/pv176-network.template" + "Lib::private_network": "https://gitlab.ics.muni.cz/396462/PV176/raw/master/Openstack/pv176-network.template", "Lib::server_vm": "https://gitlab.ics.muni.cz/396462/PV176/raw/master/Openstack/pv176-server.template" } } \ No newline at end of file diff --git a/Openstack/pv176-init.json b/Openstack/pv176-init.json index ae6e1967a0bb557d71c8116db5c1d12dac428b2d..084362b49fb49d08c50dcebea8a7e9c8584ea8f3 100644 --- a/Openstack/pv176-init.json +++ b/Openstack/pv176-init.json @@ -18,10 +18,7 @@ "properties":{ "count": { "get_param": "lab_size" }, "resource_def":{ - "type": "Lib::server_vm", - "properties":{ - "network": { "get_attr": "pv176-net" } - } + "type": "Lib::server_vm" } } } diff --git a/Openstack/pv176-network.template b/Openstack/pv176-network.template index 47d928af8dcd880cfd5609ad3302856e14ac21c2..dc8ed93b54caa0e1aae1d42c2f51a0aa35b8cc57 100644 --- a/Openstack/pv176-network.template +++ b/Openstack/pv176-network.template @@ -63,4 +63,21 @@ } } } + "outputs":{ + "network_name":{ + "value": { "get_attr": [internal_net] } + } + "network_subnet":{ + "value": { "get_attr": [internal_subnet] } + } + "network_router":{ + "value": { "get_attr": [internal_router] } + } + "network_interface":{ + "value": { "get_attr": [internal_interface] } + } + "network_security_group":{ + "value": { "get_attr": [full_access_secgroup] } + } + } } \ No newline at end of file diff --git a/Openstack/pv176-server.template b/Openstack/pv176-server.template index 4baeb886b8144bb5d38b7dc821f81dad84c1357d..bf1799a9a656b60625f68da55a4e52c707bfc82e 100644 --- a/Openstack/pv176-server.template +++ b/Openstack/pv176-server.template @@ -7,6 +7,7 @@ "name": "PV176-server", "flavor": "m1.large", "image": "73ff33dc-346d-46c8-8786-3bbc97e21c64", + "network":"" } } }