commit d00a8f5d4e6f226c651a85f8b73e08af2ddc7826
author Matthew Mosesohn <mmosesohn@mirantis.com> Mon May 22 17:07:19 2017 +0300
committer Matthew Mosesohn <mmosesohn@mirantis.com> Mon May 22 17:11:21 2017 +0300
tree 20c26c15e4af3d2383f51272dbe6afc881393466
parent 90b15a0f31c9b46d3ef1afaae75fa90f855d35f1

Add calico params to lab-pipeline

Change-Id: I9c5c9180bc24408a14b12449a15aa0cc5021d653

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index da04f62..8a314ef 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -37,6 +37,9 @@
  *
  * optional parameters for overwriting soft params
  *   KUBERNETES_HYPERKUBE_IMAGE  Docker repository and tag for hyperkube image
+ *   CALICO_CNI_IMAGE            Docker repository and tag for calico CNI image
+ *   CALICO_NODE_IMAGE           Docker repository and tag for calico node image
+ *   CALICOCTL_IMAGE             Docker repository and tag for calicoctl image
  *
  */
 
@@ -160,6 +163,16 @@
                     if (env.getEnvironment().containsKey("KUBERNETES_HYPERKUBE_IMAGE")) {
                         salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'file.append', overwriteFile, "    kubernetes_hyperkube_image: ${KUBERNETES_HYPERKUBE_IMAGE}")
                     }
+                    // Overwrite Calico vars if specified
+                    if (env.getEnvironment().containsKey("CALICO_CNI_IMAGE")) {
+                      salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, "    kubernetes_calico_cni_image: ${CALICO_CNI_IMAGE}")
+                    }
+                    if (env.getEnvironment().containsKey("CALICO_NODE_IMAGE")) {
+                      salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, "    kubernetes_calico_node_image: ${CALICO_NODE_IMAGE}")
+                    }
+                    if (env.getEnvironment().containsKey("CALICOCTL_IMAGE")) {
+                      salt.runSaltProcessStep(saltmaster, 'I@salt:master', 'file.append', overwriteFile, "    kubernetes_calicoctl_image: ${CALICOCTL_IMAGE}")
+                    }
 
                     orchestrate.installKubernetesControl(saltMaster)
                 }