From 98f32476e3ab823fcedbeca9608dd967925428a6 Mon Sep 17 00:00:00 2001
From: Martin Cuchran <cuchy@Martins-MacBook-Pro-4.local>
Date: Tue, 7 Feb 2017 09:09:21 +0100
Subject: [PATCH] Network output json added
---
Openstack/pv176-env.json | 2 +-
Openstack/pv176-init.json | 5 +----
Openstack/pv176-network.template | 17 +++++++++++++++++
Openstack/pv176-server.template | 1 +
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/Openstack/pv176-env.json b/Openstack/pv176-env.json
index 935059c..812a64a 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 ae6e196..084362b 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 47d928a..dc8ed93 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 4baeb88..bf1799a 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":""
}
}
}
--
GitLab