8 files changed, 5 insertions, 28 deletions
diff --git a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
index d49fcf677..1b2e2d0fb 100644
--- a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
+++ b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml
@@ -14,7 +14,6 @@ cluster:
     - neutron_gateway
     - quagga
     - networks
-    - sqlalchemy_update
 virtual:
   nodes:
     control:
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml b/mcp/config/scenario/os-odl-nofeature-ha.yaml
index 61a28891d..51d476de5 100644
--- a/mcp/config/scenario/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml
@@ -12,7 +12,6 @@ cluster:
     - opendaylight
     - openstack_ha
     - networks
-    - sqlalchemy_update
 virtual:
   nodes:
     control:
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index b43f790ce..3133d0e62 100644
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml
@@ -13,7 +13,6 @@ cluster:
     - openstack_noha
     - neutron_gateway
     - networks
-    - sqlalchemy_update
 virtual:
   nodes:
     control:
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml
index 02f652bee..e2df6a476 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml
@@ -14,7 +14,6 @@ cluster:
     - openstack_noha
     - neutron_gateway
     - networks
-    - sqlalchemy_update
 virtual:
   nodes:
     control:
diff --git a/mcp/config/scenario/os-odl-sfc-noha.yaml b/mcp/config/scenario/os-odl-sfc-noha.yaml
index 88ad1037b..8611b0261 100644
--- a/mcp/config/scenario/os-odl-sfc-noha.yaml
+++ b/mcp/config/scenario/os-odl-sfc-noha.yaml
@@ -14,7 +14,6 @@ cluster:
     - neutron_gateway
     - tacker
     - networks
-    - sqlalchemy_update
 virtual:
   nodes:
     control:
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 924dc30f1..a45d397d3 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -15,7 +15,8 @@ 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"
+salt -I 'rabbitmq:server' cmd.run 'mkdir -p /etc/rabbitmq && echo HOSTNAME=localhost > /etc/rabbitmq/rabbitmq-env.conf'
+wait_for 5.0 "salt -I 'rabbitmq:cluster:role:master' state.sls rabbitmq"
 salt -I 'rabbitmq:server' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
 
@@ -34,9 +35,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..a81689e76 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -16,6 +16,7 @@ salt -I 'nfs:server' file.mkdir /srv/nova/instances
 salt -I 'nfs:server' state.sls nfs
 salt -I 'nfs:client' state.sls nfs
 
+salt -I 'rabbitmq:server' cmd.run 'mkdir -p /etc/rabbitmq && echo HOSTNAME=localhost > /etc/rabbitmq/rabbitmq-env.conf'
 salt -I 'rabbitmq:server' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl status"
 
@@ -23,17 +24,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