From aa443647aa36a04cf34358647310ca3baa4ed216 Mon Sep 17 00:00:00 2001 From: AakashKT Date: Tue, 11 Jul 2017 18:35:27 +0530 Subject: segregrate the flannel and ovn whoch is controlled by commad line parameter Change-Id: I005827f72631bea8b11e302a84aaf95de8dee1c8 Signed-off-by: Aakash KT --- ci/config_tpl/juju2/bundlek8_tpl/relations.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ci/config_tpl/juju2/bundlek8_tpl/relations.yaml') diff --git a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml index 3a34aa1e..44018201 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml @@ -7,9 +7,14 @@ - [ 'kubernetes-master:etcd', 'etcd:db' ] - [ 'kubernetes-master:kube-control', 'kubernetes-worker:kube-control' ] - [ 'kubernetes-worker:certificates', 'easyrsa:client' ] +{% if k8.network.controller == 'ovn' %} + - [ 'ovn:cni', 'kubernetes-master:cni' ] + - [ 'ovn:cni', 'kubernetes-worker:cni' ] +{% else %} - [ 'flannel:etcd', 'etcd:db' ] - [ 'flannel:cni', 'kubernetes-master:cni' ] - [ 'flannel:cni', 'kubernetes-worker:cni' ] +{% endif %} - [ 'etcd:certificates', 'easyrsa:client' ] {% if k8.feature.loadbalancer %} - [ 'kubernetes-master:loadbalancer', 'kubeapi-load-balancer:loadbalancer' ] -- cgit 1.2.3-korg