diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh index 7c0be14c82c..54e749e6fe8 100755 --- a/cluster/gce/configure-vm.sh +++ b/cluster/gce/configure-vm.sh @@ -281,6 +281,9 @@ network_provider: '$(echo "$NETWORK_PROVIDER")' opencontrail_tag: '$(echo "$OPENCONTRAIL_TAG")' opencontrail_kubernetes_tag: '$(echo "$OPENCONTRAIL_KUBERNETES_TAG")' opencontrail_public_subnet: '$(echo "$OPENCONTRAIL_PUBLIC_SUBNET")' +enable_manifest_url: '$(echo "$ENABLE_MANIFEST_URL" | sed -e "s/'/''/g")' +manifest_url: '$(echo "$MANIFEST_URL" | sed -e "s/'/''/g")' +manifest_url_header: '$(echo "$MANIFEST_URL_HEADER" | sed -e "s/'/''/g")' EOF if [ -n "${APISERVER_TEST_ARGS:-}" ]; then diff --git a/cluster/gce/debian/helper.sh b/cluster/gce/debian/helper.sh index 3b778b468fe..7fa80edc869 100755 --- a/cluster/gce/debian/helper.sh +++ b/cluster/gce/debian/helper.sh @@ -83,6 +83,9 @@ MASTER_KEY: $(yaml-quote ${MASTER_KEY_BASE64:-}) KUBECFG_CERT: $(yaml-quote ${KUBECFG_CERT_BASE64:-}) KUBECFG_KEY: $(yaml-quote ${KUBECFG_KEY_BASE64:-}) KUBELET_APISERVER: $(yaml-quote ${KUBELET_APISERVER:-}) +ENABLE_MANIFEST_URL: $(yaml-quote ${ENABLE_MANIFEST_URL:-false}) +MANIFEST_URL: $(yaml-quote ${MANIFEST_URL:-}) +MANIFEST_URL_HEADER: $(yaml-quote ${MANIFEST_URL_HEADER:-}) EOF if [ -n "${APISERVER_TEST_ARGS:-}" ]; then cat >>$file <