From fab511daabb05c493943b5f7a2ea8b5fe0802e2d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 7 Oct 2019 17:07:31 +0200 Subject: [baremetal] Stein, Bionic, py3 support Change-Id: If3f8cb6bfeedeb766a050d5a271b21c90bb3ba1c Signed-off-by: Alexandru Avadanii --- mcp/config/states/openstack_ha | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mcp/config/states/openstack_ha') diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 7cf40086e..c28d0b46b 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -66,6 +66,12 @@ salt -I 'barbican:server:role:primary' state.sls barbican salt -I 'barbican:server:role:secondary' state.sls barbican salt -I 'barbican:client' state.sls barbican +# remove config files coming from packages +for service in gnocchi panko; do + salt -I "${service}:server" pkg.install ${service}-api + salt -I "${service}:server" file.remove "/etc/apache2/sites-enabled/${service}-api.conf" +done + salt -I 'redis:cluster:role:master' state.sls redis salt -I 'redis:server' state.sls redis salt -I 'gnocchi:server:role:primary' state.sls gnocchi @@ -77,7 +83,7 @@ salt -I 'aodh:server:role:secondary' state.sls aodh salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer -salt -I 'horizon:server' state.sls apache,horizon +wait_for 3.0 "salt -I 'horizon:server' state.sls apache,horizon" salt -I 'nginx:server' state.sls nginx cluster_public_host=$(salt -C 'I@nginx:server and *01*' --out=yaml \ -- cgit 1.2.3-korg