fixes for OpenStack cloudprovider
Change-Id: I52d5f4b1e660f70d6ec2678ff42269d08d4c1c25
diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index 756a19a..916d67d 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -134,7 +134,7 @@
{%- if common.get('cloudprovider', {}).get('enabled') and common.get('cloudprovider', {}).get('provider') == 'openstack' %}
/etc/kubernetes/cloud-config.conf:
file.managed:
- - source: salt://kubernetes/files/cloudprovider/cloud-config.conf
+ - source: salt://kubernetes/files/cloudprovider/cloud-config-openstack.conf
- template: jinja
- user: root
- group: root
diff --git a/kubernetes/files/cloudprovider/cloud-config-openstack.conf b/kubernetes/files/cloudprovider/cloud-config-openstack.conf
index 0121a2b..48d09e6 100644
--- a/kubernetes/files/cloudprovider/cloud-config-openstack.conf
+++ b/kubernetes/files/cloudprovider/cloud-config-openstack.conf
@@ -4,22 +4,23 @@
username={{ common.cloudprovider.params.username }}
password={{ common.cloudprovider.params.password }}
region={{ common.cloudprovider.params.region }}
-{%- if {{ common.cloudprovider.params.tenant_id is defined %}
-tenant-id={{ common.cloudprovider.params.tenant_id %}
+{%- if common.cloudprovider.params.tenant_id is defined %}
+tenant-id={{ common.cloudprovider.params.tenant_id }}
{%- endif %}
-{%- if {{ common.cloudprovider.params.tenant_name is defined %}
-tenant-name={{ common.cloudprovider.params.tenant_name %}
+{%- if common.cloudprovider.params.tenant_name is defined %}
+tenant-name={{ common.cloudprovider.params.tenant_name }}
{%- endif %}
-{%- if {{ common.cloudprovider.params.domain_id is defined %}
-domain-id={{ common.cloudprovider.params.domain_id %}
+{%- if common.cloudprovider.params.domain_id is defined %}
+domain-id={{ common.cloudprovider.params.domain_id }}
{%- endif %}
-{%- if {{ common.cloudprovider.params.tenant_name is defined %}
-domain-name={{ common.cloudprovider.params.domain_name %}
+{%- if common.cloudprovider.params.tenant_name is defined %}
+domain-name={{ common.cloudprovider.params.domain_name }}
{%- endif %}
[LoadBalancer]
-subnet-id={{ common.cloudprovider.params.subnet_id }
-{%- if {{ common.cloudprovider.params.floating_network_id is defined %}
+subnet-id={{ common.cloudprovider.params.subnet_id }}
+{%- if common.cloudprovider.params.floating_network_id is defined %}
floating-network-id={{ common.cloudprovider.params.floating_network_id }}
+{%- endif %}
lb-version=v2