From e0caa1e559b0e877ce34a28f4bd5cd5dc69e78cb Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 15 Mar 2016 10:13:27 -0400 Subject: [PATCH] non_masquerade_cidr: verify-flags exception, salt syntax Cope is non_masquerade_cidr value is empty; add exception for verify-flags. --- cluster/saltbase/salt/kubelet/default | 2 +- hack/verify-flags/exceptions.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 81710ea6a52..0aa2ac5e4f9 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -88,7 +88,7 @@ {% endif -%} {% set non_masquerade_cidr = "" -%} -{% if pillar.get('non_masquerade_cidr','') is defined -%} +{% if pillar.get('non_masquerade_cidr','') -%} {% set non_masquerade_cidr = "--non-masquerade-cidr=" + pillar.non_masquerade_cidr -%} {% endif -%} diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 5b0741a6217..3b00ba87b14 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -69,6 +69,7 @@ cluster/saltbase/salt/kubelet/default: {% set api_servers_with_port = api_serve cluster/saltbase/salt/kubelet/default: {% set enable_custom_metrics="--enable-custom-metrics=" + pillar['enable_custom_metrics'] %} cluster/saltbase/salt/kubelet/default: {% set kubelet_port="--port=" + pillar['kubelet_port'] %} cluster/saltbase/salt/kubelet/default: {% set node_labels="--node-labels=" + pillar['node_labels'] %} +cluster/saltbase/salt/kubelet/default:{% if pillar.get('non_masquerade_cidr','') -%} cluster/saltbase/salt/opencontrail-networking-master/init.sls: - 'SERVICE_CLUSTER_IP_RANGE': '{{ pillar.get('service_cluster_ip_range') }}' cluster/saltbase/salt/opencontrail-networking-minion/init.sls: - 'SERVICE_CLUSTER_IP_RANGE': '{{ pillar.get('service_cluster_ip_range') }}' cluster/saltbase/salt/supervisor/kubelet-checker.sh: {% set kubelet_port = pillar['kubelet_port'] -%}