From 4c0566331943dbc481f868e5596d0e68934c1309 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 11 Dec 2017 19:30:17 +0400 Subject: [baremetal] Fixup pike deployment * up glusterfs.client state before actual volume usage * handle keystone server state * specify suitable nova packages list for uca repo (consoleproxy vs novncproxy) * upgrade vcp nodes to get proper cryptography library for keystone * align service names for libvirt & glusterfs Change-Id: Iaeb7d147e6d407bbeaec2d40fd81037c939c3fe0 Signed-off-by: Michael Polenchuk --- mcp/config/states/openstack_ha | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mcp/config/states/openstack_ha') 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 -- cgit 1.2.3-korg