modfied to support k8.

Change-Id: I274e0e381ec3ee7263df622cabfcc3a68516f16f
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
index 17281be..400dcb4 100644 (file)
--- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
@@ -16,7 +16,7 @@
 {% include 'easyrsa.yaml' %}
 {% include 'etcd.yaml' %}
 {% include 'subordinate.yaml' %}
-{% if os.kubernetes.loadbalancer %}
+{% if k8.feature.loadbalancer %}
 {% include 'kubeapi-load-balancer.yaml' %}
 {% endif %}
 

diff --git a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
index eaea954..ca6de4a 100644 (file)
--- a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
@@ -1,12 +1,12 @@
     etcd:
       charm: "./{{ ubuntu.release }}/etcd"
-{% if os.kubernetes.loadbalancer %}
+{% if k8.feature.loadbalancer %}
       num_units: 3
 {% else %}
       num_units: 1
 {% endif %}
       to:
-{% if os.kubernetes.loadbalancer %}
+{% if k8.feature.loadbalancer %}
 {% for unit_id in to_select() %}
         - "nodes/{{ unit_id }}"
 {% endfor %}

diff --git a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml
index 63fefab..de69b76 100644 (file)
--- a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml
@@ -1,4 +1,4 @@
-{% if os.kubernetes.loadbalancer %}
+{% if k8.feature.loadbalancer %}
     - [ 'kubernetes-master:kube-api-endpoint', 'kubeapi-load-balancer:apiserver' ]
 {% else %}
     - [ 'kubernetes-master:kube-api-endpoint', 'kubernetes-worker:kube-api-endpoint' ]
@@ -11,7 +11,7 @@
     - [ 'flannel:cni', 'kubernetes-master:cni' ]
     - [ 'flannel:cni', 'kubernetes-worker:cni' ]
     - [ 'etcd:certificates', 'easyrsa:client' ]
-{% if os.kubernetes.loadbalancer %}
+{% if k8.feature.loadbalancer %}
     - [ 'kubernetes-master:loadbalancer', 'kubeapi-load-balancer:loadbalancer' ]
     - [ 'kubernetes-worker:kube-api-endpoint', 'kubeapi-load-balancer:website' ]
     - [ 'kubeapi-load-balancer:certificates', 'easyrsa:client' ]