From f2a813931b01e29783eb927e5962a920a1ada27e Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 20 Jun 2017 14:21:23 +0400 Subject: [mcp] Mend networks config * create openstack/neutron external network * set default gateway for mgmt network Change-Id: I71c22ab6d1b8c589c1cf147aa37874600ab1cbd7 Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/system | 2 +- mcp/reclass/scripts/net_mgmt.xml | 1 + mcp/reclass/scripts/openstack.sh | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'mcp/reclass') diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index a0317fcce..8c33e7f15 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit a0317fccebde8b0c557719bce7e6c57dff0b2bc2 +Subproject commit 8c33e7f156c442781accedcb8ad73288633bac09 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 @@ mgmt + 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 -- cgit 1.2.3-korg