summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-01-25 17:47:43 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-01-25 17:48:25 -0600
commit7188808f4521feb83e828b14479db8df70c60a7b (patch)
treed44b5fc600eeaa283134992e56bacc603d13b780 /ci/config_tpl/juju2
parent5cb0ea7a1b2473a1969e48eff41ff50d540c53bd (diff)
modified to fix kubernetes issue.
Change-Id: Ib9d90bc171836aa83f455d6727c9a1457b5fd400 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/easyrsa.yaml2
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml2
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/kubeapi-load-balancer.yaml2
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml4
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml2
5 files changed, 6 insertions, 6 deletions
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
index f5162ad7..27c0e874 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
@@ -1,5 +1,5 @@
easyrsa:
- charm: "./{{ ubuntu.release }}/easyrsa"
+ charm: "cs:~containers/easyrsa"
num_units: 1
to:
- "lxd:nodes/0"
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
index ca6de4a3..d79c5962 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
@@ -1,5 +1,5 @@
etcd:
- charm: "./{{ ubuntu.release }}/etcd"
+ charm: "cs:~containers/etcd"
{% if k8.feature.loadbalancer %}
num_units: 3
{% else %}
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/kubeapi-load-balancer.yaml b/ci/config_tpl/juju2/bundlek8_tpl/kubeapi-load-balancer.yaml
index 08e7b33a..a0b829c2 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/kubeapi-load-balancer.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/kubeapi-load-balancer.yaml
@@ -1,6 +1,6 @@
kubeapi-load-balancer:
- charm: "./{{ ubuntu.release }}/kubeapi-load-balancer"
+ charm: "cs:~containers/kubeapi-load-balancer"
num_units: 1
expose: true
to:
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml
index 3953734b..93f8890e 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml
@@ -1,12 +1,12 @@
kubernetes-master:
- charm: "./{{ ubuntu.release }}/kubernetes-master"
+ charm: "cs:~containers/kubernetes-master"
num_units: 1
expose: true
to:
- "nodes/0"
kubernetes-worker:
- charm: "./{{ ubuntu.release }}/kubernetes-worker"
+ charm: "cs:~containers/kubernetes-worker"
num_units: {{ opnfv.units - 1 }}
expose: true
to:
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml
index b800d59b..30832c54 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml
@@ -1,4 +1,4 @@
flannel:
- charm: ./{{ ubuntu.release }}/flannel
+ charm: cs:~containers/flannel