baremetal: HA: Standalone openstack_ha state

Replicate all calls from "openstack" state to "openstack_ha",
while adjusting minor parameters for HA, based on [1].

[1] https://docs.mirantis.com/mcp/1.0/mcp-deployment-guide/\
    deploy-mcp-cluster-manually.html

Change-Id: Iaf2262fa9c54f2401b69635ff46329ffb856f802
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index 1118d28..3f78bea 100644 (file)
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -3,7 +3,6 @@ cluster:
   states:
     - maas
     - openstack_ha
-    - openstack
     - neutron_compute
     - networks
 virtual:

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 2932735..90e510a 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -1,4 +1,5 @@
 salt -I 'keepalived:cluster' state.sls keepalived -b 1
+salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address
 
 salt -I 'rabbitmq:server' state.sls rabbitmq # maybe twice
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
@@ -10,3 +11,32 @@ salt -I 'glusterfs:server' cmd.run "gluster peer status; gluster volume status"
 salt -I 'galera:master' state.sls galera
 salt -I 'galera:slave' state.sls galera
 salt -I 'galera:master' mysql.status | grep -A1 wsrep_cluster_size
+
+salt -I 'memcached:server' state.sls memcached
+
+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
+salt -I 'keystone:server' service.restart apache2
+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 'glance:server' 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
+
+salt -I 'cinder:controller' state.sls cinder -b 1
+salt -I 'cinder:volume' state.sls cinder
+
+salt -I 'neutron:server' state.sls neutron -b 1
+salt -I 'neutron:gateway' state.sls neutron
+
+salt -I 'nova:compute' state.sls nova
+
+salt -I 'horizon:server' state.sls horizon
+salt -I 'nginx:server' state.sls nginx