Call installDockerSwarm independently
installDockerSwarm function has built in check that rely on
docker:swarm pillar presense and it might be used independentl
from k8s or oss.
This patch moves installDockerSwarm call outside of
component checks to be able to use it with other MCP
components like Openstack.
Change-Id: If23c32379b1e865e76e03e54eeeb6303fda7bb57
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 8802cea..f05735a 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -447,6 +447,9 @@
}
}
+ // install docker swarm
+ orchestrate.installDockerSwarm(venvPepper, extra_tgt)
+
// install openstack
if (common.checkContains('STACK_INSTALL', 'openstack')) {
// install control, tests, ...
@@ -513,7 +516,6 @@
if (common.checkContains('STACK_INSTALL', 'cicd')) {
stage('Install Cicd') {
orchestrate.installInfra(venvPepper, extra_tgt)
- orchestrate.installDockerSwarm(venvPepper, extra_tgt)
orchestrate.installCicd(venvPepper, extra_tgt)
}
}
@@ -527,7 +529,6 @@
if (common.checkContains('STACK_INSTALL', 'stacklight')) {
stage('Install StackLight') {
- orchestrate.installDockerSwarm(venvPepper, extra_tgt)
orchestrate.installStacklight(venvPepper, extra_tgt)
}
}
@@ -536,7 +537,6 @@
stage('Install OSS') {
if (!common.checkContains('STACK_INSTALL', 'stacklight')) {
// In case if StackLightv2 enabled containers already started
- orchestrate.installDockerSwarm(venvPepper, extra_tgt)
salt.enforceState(venvPepper, "I@docker:swarm:role:master and I@devops_portal:config ${extra_tgt}", 'docker.client', true)
}
orchestrate.installOss(venvPepper, extra_tgt)