From 8726a0d7ed8286d1aa86523a4acf61d9d4b4c9cd Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 20 Nov 2017 15:50:53 +0400 Subject: [virtual] Update openstack version to pike Change-Id: I1df0228cb44bf9122aaf93dd25fc16a0d26a5240 Signed-off-by: Michael Polenchuk --- mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml | 2 +- mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml | 2 +- mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml | 2 +- mcp/config/states/openstack | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'mcp/config') diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml index 2f4d401db..0302464b6 100644 --- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: virtual-mcp-ocata-ovs.local + domain: virtual-mcp-pike-ovs.local states: - openstack - neutron_compute diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml index a1a9e4175..02ab5b2c3 100644 --- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: virtual-mcp-ocata-ovs-dpdk.local + domain: virtual-mcp-pike-ovs-dpdk.local states: - dpdk - openstack diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml index 78923531d..c9285abb7 100644 --- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: virtual-mcp-ocata-odl-router.local + domain: virtual-mcp-pike-odl.local states: - opendaylight - openstack diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack index 369e16504..1578dcffc 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack @@ -20,8 +20,10 @@ salt -I 'mysql:server' state.sls mysql salt -I 'memcached:server' state.sls memcached salt -I 'haproxy:proxy' state.sls haproxy -salt -I 'keystone:server' state.sls keystone.server +set +e; salt -I 'keystone:server' state.sls keystone.server; set -e salt -I 'keystone:server' service.restart apache2 +salt -I 'keystone:server' state.sls keystone.server + salt -I 'keystone:server' state.sls keystone.client salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" @@ -41,7 +43,7 @@ salt -I 'neutron:gateway' state.sls neutron salt -I 'nova:compute' state.sls nova -salt -I 'mongodb:server' state.sls mongodb +salt -I 'mongodb:server' state.sls mongodb || salt -I 'mongodb:server' state.sls mongodb salt -I 'aodh:server' state.sls aodh salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer -- cgit 1.2.3-korg