summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-06-20 14:21:23 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-06-20 14:27:08 +0400
commitf2a813931b01e29783eb927e5962a920a1ada27e (patch)
tree6d33e3b84dd5ce4858e4179c7c37e26f72b2ae92
parent5b6ef486ab10ed93d5212daa64edeb59cd2c71ff (diff)
[mcp] Mend networks config
* create openstack/neutron external network * set default gateway for mgmt network Change-Id: I71c22ab6d1b8c589c1cf147aa37874600ab1cbd7 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
m---------mcp/reclass/classes/system0
-rw-r--r--mcp/reclass/scripts/net_mgmt.xml1
-rwxr-xr-xmcp/reclass/scripts/openstack.sh8
3 files changed, 5 insertions, 4 deletions
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject a0317fccebde8b0c557719bce7e6c57dff0b2bc
+Subproject 8c33e7f156c442781accedcb8ad73288633bac0
diff --git a/mcp/reclass/scripts/net_mgmt.xml b/mcp/reclass/scripts/net_mgmt.xml
index fde2a23fa..0ba613152 100644
--- a/mcp/reclass/scripts/net_mgmt.xml
+++ b/mcp/reclass/scripts/net_mgmt.xml
@@ -1,4 +1,5 @@
<network>
<name>mgmt</name>
<bridge name="mgmt"/>
+ <ip address="172.16.10.1" netmask="255.255.255.0"/>
</network>
diff --git a/mcp/reclass/scripts/openstack.sh b/mcp/reclass/scripts/openstack.sh
index 3f6b0617c..c3ffb0d7f 100755
--- a/mcp/reclass/scripts/openstack.sh
+++ b/mcp/reclass/scripts/openstack.sh
@@ -46,8 +46,8 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << OPENSTACK_INSTALL_END
salt -C 'I@nova:compute' state.sls nova
salt -C 'I@neutron:compute' state.sls neutron
- salt -C 'I@keystone:server' cmd.run ". /root/keystonercv3; nova service-list"
- salt -C 'I@keystone:server' cmd.run ". /root/keystonercv3; neutron agent-list"
- salt -C 'I@keystone:server' cmd.run ". /root/keystonercv3; heat stack-list"
- salt -C 'I@keystone:server' cmd.run ". /root/keystonercv3; cinder list"
+ salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume list"
+
+ salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --share --external --provider-network-type flat --provider-physical-network physnet1 floating_net"
+ salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet"
OPENSTACK_INSTALL_END