summaryrefslogtreecommitdiffstats
path: root/mcp/config/states
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-11-23 17:17:59 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-12-19 17:05:47 +0400
commita31343155a621469f6e803b23dc6cc8bbb545dfa (patch)
treec6d641c926164d4397b1925c3dcf28c8738935f8 /mcp/config/states
parent59163643073370c58a201b45c0e1dd5556e2b0f6 (diff)
Update OpenStack version to Rocky
Change-Id: I88f28370180278c4b32599b83eebbb0ee005c936 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config/states')
-rwxr-xr-xmcp/config/states/openstack_ha5
-rwxr-xr-xmcp/config/states/openstack_noha5
-rwxr-xr-xmcp/config/states/sqlalchemy_update16
3 files changed, 3 insertions, 23 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 924dc30f1..3bd1c51bd 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -15,7 +15,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
wait_for 5.0 "salt -I 'keepalived:cluster' state.sls keepalived -b 1"
wait_for 5.0 "salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address"
-wait_for 5.0 "salt -C 'I@rabbitmq:server and *01*' state.sls rabbitmq"
+wait_for 5.0 "salt -I 'rabbitmq:server:cluster:role:master' state.sls rabbitmq"
salt -I 'rabbitmq:server' state.sls rabbitmq
salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
@@ -34,9 +34,8 @@ salt -I 'haproxy:proxy' state.sls haproxy
salt -I 'haproxy:proxy' service.status haproxy
salt -I 'haproxy:proxy' service.restart rsyslog
-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
+salt -I 'keystone:server' service.restart apache2
wait_for 30.0 "salt -I 'keystone:client' state.sls keystone.client"
salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 44360e5e9..98e2eff73 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -23,17 +23,14 @@ salt -I 'mysql:server' state.sls mysql
salt -I 'memcached:server' state.sls memcached
salt -I 'haproxy:proxy' state.sls haproxy
-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' service.restart apache2
salt -I 'keystone:server' state.sls keystone.client
salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
salt -I 'glance:server' state.sls glance
-# apply nova state twice to complete broken db sync
-salt -I 'nova:controller' state.sls nova
salt -I 'nova:controller' state.sls nova
salt -I 'heat:server' state.sls heat
diff --git a/mcp/config/states/sqlalchemy_update b/mcp/config/states/sqlalchemy_update
deleted file mode 100755
index d4901a9c5..000000000
--- a/mcp/config/states/sqlalchemy_update
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-sqlalchemy_ver=1.2.1
-
-salt -I 'neutron:server' pkg.install python-pip
-salt -I 'neutron:server' cmd.run \
- "sudo -H -u neutron pip install --user SQLAlchemy==${sqlalchemy_ver}"
-
-salt -I 'neutron:server' service.restart neutron-server