diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-11 17:15:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-12-11 17:15:05 +0000 |
commit | cce966ccdff1ef69898e1028bb8370923e3629d9 (patch) | |
tree | 063f177012b06578bcfb8ae728f1ce871979e7d8 /mcp/config/states/openstack_ha | |
parent | a184534e19e2afcfd08b4bade6e87dae4c454b71 (diff) | |
parent | 4c0566331943dbc481f868e5596d0e68934c1309 (diff) |
Merge "[baremetal] Fixup pike deployment"
Diffstat (limited to 'mcp/config/states/openstack_ha')
-rwxr-xr-x | mcp/config/states/openstack_ha | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index fbddc6e83..62a965401 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -22,6 +22,7 @@ salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status" salt -I 'glusterfs:server' state.sls glusterfs.server.service salt -I 'glusterfs:server' state.sls glusterfs.server.setup -b 1 salt -I 'glusterfs:server' cmd.run "gluster peer status; gluster volume status" -b 1 +salt -I 'glusterfs:client' state.sls glusterfs.client salt -I 'galera:master' state.sls galera salt -I 'galera:slave' state.sls galera @@ -33,15 +34,14 @@ salt -I 'haproxy:proxy' state.sls haproxy salt -I 'haproxy:proxy' service.status haproxy salt -I 'haproxy:proxy' service.restart rsyslog -salt -I 'keystone:server' state.sls keystone.server -b 1 +set +e; salt -I 'keystone:server' state.sls keystone.server -b 1; set -e salt -I 'keystone:server' service.restart apache2 +salt -I 'keystone:server' state.sls keystone.server -b 1 + wait_for 30 "salt -I 'keystone:client' state.sls keystone.client" salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" salt -I 'glance:server' state.sls glance -b 1 -salt -I 'glusterfs:client' state.sls glusterfs.client -salt -I 'keystone:server' state.sls keystone.server - salt -I 'nova:controller' state.sls nova -b 1 salt -I 'heat:server' state.sls heat -b 1 |