From 899e61ef3cf6af85029cddbe7e989c28820c02d5 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 7 Feb 2016 11:11:38 -0500 Subject: [PATCH] Update verify-flags exceptions --- hack/verify-flags/exceptions.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 33875837998..5156ea78b43 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -1,13 +1,15 @@ Vagrantfile: node_ip = $node_ips[n] cluster/addons/registry/images/Dockerfile:ADD run_proxy.sh /usr/bin/run_proxy cluster/addons/registry/images/Dockerfile:CMD ["/usr/bin/run_proxy"] -cluster/aws/templates/salt-minion.sh: hostname_override: "${HOSTNAME_OVERRIDE}" -cluster/aws/templates/salt-minion.sh:# We set the hostname_override to the full EC2 private dns name +cluster/aws/templates/configure-vm-aws.sh: # We set the hostname_override to the full EC2 private dns name +cluster/aws/templates/configure-vm-aws.sh: api_servers: '${API_SERVERS}' +cluster/aws/templates/configure-vm-aws.sh: env-to-grains "hostname_override" +cluster/aws/templates/configure-vm-aws.sh: env-to-grains "runtime_config" cluster/centos/util.sh: local node_ip=${node#*@} cluster/gce/configure-vm.sh: advertise_address: '${EXTERNAL_IP}' cluster/gce/configure-vm.sh: api_servers: '${KUBERNETES_MASTER_NAME}' cluster/gce/configure-vm.sh: cloud_config: ${CLOUD_CONFIG} -cluster/gce/configure-vm.sh: runtime_config: '$(echo "$RUNTIME_CONFIG" | sed -e "s/'/''/g")' +cluster/gce/configure-vm.sh: env-to-grains "runtime_config" cluster/gce/coreos/helper.sh:# cloud_config yaml file should be passed cluster/gce/util.sh: local node_ip=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \ cluster/juju/charms/trusty/kubernetes-master/files/controller-manager.upstart.tmpl: --address=%(bind_address)s \