Apply haproxy states during Stacklight deploy
Change-Id: I427a410a85be3bccc7458cb8e12d3fb5694a87a9
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index aa4c6f4..332d434 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -344,6 +344,22 @@
def common = new com.mirantis.mk.Common()
def salt = new com.mirantis.mk.Salt()
+ // Install galera
+ withEnv(['ASK_ON_ERROR=false']){
+ retry(2) {
+ salt.enforceState(master, 'I@galera:master', 'galera', true)
+ }
+ }
+ salt.enforceState(master, 'I@galera:slave', 'galera', true)
+
+ // Check galera status
+ salt.runSaltProcessStep(master, 'I@galera:master', 'mysql.status')
+ salt.runSaltProcessStep(master, 'I@galera:slave', 'mysql.status')
+
+ // Install haproxy
+ salt.enforceState(master, 'I@haproxy:proxy', 'haproxy')
+ salt.runSaltProcessStep(master, 'I@haproxy:proxy', 'service.status', ['haproxy'])
+
//Install Telegraf
salt.enforceState(master, 'I@telegraf:agent or I@telegraf:remote_agent', 'telegraf', true)
@@ -357,18 +373,6 @@
salt.enforceState(master, '*01* and I@influxdb:server', 'influxdb', true)
salt.enforceState(master, 'I@influxdb:server', 'influxdb', true)
- // Install galera
- withEnv(['ASK_ON_ERROR=false']){
- retry(2) {
- salt.enforceState(master, 'I@galera:master', 'galera', true)
- }
- }
- salt.enforceState(master, 'I@galera:slave', 'galera', true)
-
- // Check galera status
- salt.runSaltProcessStep(master, 'I@galera:master', 'mysql.status')
- salt.runSaltProcessStep(master, 'I@galera:slave', 'mysql.status')
-
//Collect Grains
salt.enforceState(master, 'I@salt:minion', 'salt.minion.grains', true)
salt.runSaltProcessStep(master, 'I@salt:minion', 'saltutil.refresh_modules', [], null, true)