diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml index d76dbe3f1f9..471db9ab264 100644 --- a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml +++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml @@ -275,7 +275,7 @@ write_files: echo "Already provisioned!" exit 0 fi - + HA_CLUSTER={{ k8s.ha.cluster }} CLUSTER_PUBLIC_IP={{ k8s.public.ip }} @@ -322,7 +322,7 @@ write_files: cp -i /etc/kubernetes/admin.conf /root/.kube/config chown $(id -u):$(id -g) /root/.kube/config echo export PATH=\$PATH:/opt/bin >> /root/.bashrc - + if [[ "$HA_CLUSTER" == "true" ]]; then sed -i -E "s|(server:\\s*).*|\\1https://${CLUSTER_PUBLIC_IP}:6443|" /root/.kube/config fi diff --git a/systemvm/debian/opt/cloud/bin/cs/CsConfig.py b/systemvm/debian/opt/cloud/bin/cs/CsConfig.py index 1ad7e34db57..e6e738b042a 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsConfig.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsConfig.py @@ -126,7 +126,7 @@ class CsConfig(object): else: dns.append(self.address().get_guest_ip()) - if not 'userouteripresolver' in conf: + if 'userouteripresolver' not in conf: for name in ('dns1', 'dns2'): if name in conf: dns.append(conf[name])