Fix state ordering for SL and ssl\gluster
Change-Id: I6159b4456c17abce2287d555cce1d4a8fdb48149
Bug-related: PROD-24818 (PROD:24818)
(cherry picked from commit 833b477b87885475f10ab578a1781366ed1ba57f)
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index d1fb255..5c78681 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -797,15 +797,19 @@
def first_target
// Install core services for K8S environments:
- // HAProxy, Nginx and lusterFS clients
+ // HAProxy, Nginx and glusterFS clients.
+ // glusterFS clients must be first one, since nginx should store certs on it.
// In case of OpenStack, those are already installed
if (common.checkContains('STACK_INSTALL', 'k8s')) {
+ salt.enforceStateWithTest(master, "I@glusterfs:client ${extra_tgt}", 'glusterfs.client', "", true, true, null, false, -1, 2)
+ common.retry(3, 5){
+ salt.enforceState(master, "I@nginx:server ${extra_tgt}", 'salt.minion.cert')
+ }
+
salt.enforceState(master, "I@haproxy:proxy ${extra_tgt}", 'haproxy')
salt.runSaltProcessStep(master, "I@haproxy:proxy ${extra_tgt}", 'service.status', ['haproxy'])
salt.enforceStateWithTest(master, "I@nginx:server ${extra_tgt}", 'nginx')
-
- salt.enforceStateWithTest(master, "I@glusterfs:client ${extra_tgt}", 'glusterfs.client', "", true, true, null, false, -1, 2)
}
// Install MongoDB for Alerta