diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-19 18:36:54 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-01-19 18:38:48 -0600 |
commit | d2a46221d560ae28c890605fdadc206d6499b0e9 (patch) | |
tree | 8e009d7ebd8a0cb0114b455820e3d23a1bfc00a3 /ci/config_tpl/juju2 | |
parent | ec2e581d926243b50962490bb503b551cbc7a18b (diff) |
modfied to support k8.
Change-Id: I274e0e381ec3ee7263df622cabfcc3a68516f16f
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2')
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml | 2 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml | 4 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/relations.yaml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml index 17281be1..400dcb45 100644 --- 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 eaea9543..ca6de4a3 100644 --- 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 63fefab4..de69b769 100644 --- 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' ] |