In Vagrant, pass environment variables to master

Variables $ENABLE_CLUSTER_MONITORING and $ENABLE_CLUSTER_UI are currently set in cluster/vagrant/config-default.sh but are not passed to the master VM. Therefore, cluster/saltbase/salt/kube-addons/init.sls does not have these variables, and the add-ons cannot be enabled.

In Vagrant, pass environment variables to master
bdd4d6bb · Olivier Lemasle · 79f17154 · bdd4d6bb
Commit bdd4d6bb authored Aug 10, 2015 by Olivier Lemasle
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

util.sh cluster/vagrant/util.sh +2 -0

No files found.
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -133,7 +133,9 @@ function create-provision-scripts {
    echo "MASTER_PASSWD='${MASTER_PASSWD}'"
    echo "KUBE_USER='${KUBE_USER}'"
    echo "KUBE_PASSWORD='${KUBE_PASSWORD}'"
+    echo "ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING}'"
    echo "ENABLE_NODE_LOGGING='${ENABLE_NODE_LOGGING:-false}'"
+    echo "ENABLE_CLUSTER_UI='${ENABLE_CLUSTER_UI}'"
    echo "LOGGING_DESTINATION='${LOGGING_DESTINATION:-}'"
    echo "ENABLE_CLUSTER_DNS='${ENABLE_CLUSTER_DNS:-false}'"
    echo "DNS_SERVER_IP='${DNS_SERVER_IP:-}'"