Add missing steps for StackLight with K8S
In particular, GlusterFS clients and Nginx weren't deployed.
Change-Id: Ic89de71efdb3876a831de15ea66f3a68a3c05780
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 9ae3beb..184106b 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -448,10 +448,20 @@
def common = new com.mirantis.mk.Common()
def salt = new com.mirantis.mk.Salt()
- // Install haproxy
+ // Install core services for K8S environments:
+ // HAProxy, Nginx and lusterFS clients
+ // In case of OpenStack, those are already installed
if (common.checkContains('STACK_INSTALL', 'k8s')) {
salt.enforceState(master, 'I@haproxy:proxy', 'haproxy')
salt.runSaltProcessStep(master, 'I@haproxy:proxy', 'service.status', ['haproxy'])
+
+ if (salt.testTarget(master, 'I@nginx:server')) {
+ salt.enforceState(master, 'I@nginx:server', 'nginx', true)
+ }
+
+ if (salt.testTarget(master, 'I@glusterfs:client')) {
+ salt.enforceState(master, 'I@glusterfs:client', 'glusterfs.client', true)
+ }
}
//Install Telegraf
salt.enforceState(master, 'I@telegraf:agent or I@telegraf:remote_agent', 'telegraf', true)