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/bundle.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml') diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml index 400dcb45..96a27cfb 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml @@ -15,11 +15,16 @@ {% include 'kubernetes.yaml' %} {% include 'easyrsa.yaml' %} {% include 'etcd.yaml' %} -{% include 'subordinate.yaml' %} {% if k8.feature.loadbalancer %} {% include 'kubeapi-load-balancer.yaml' %} {% endif %} +{% if k8.network.controller == 'ovn' %} +{% include 'ovn.yaml' %} +{% else %} +{% include 'flannel.yaml' %} +{% endif %} + relations: - [ 'ntp:juju-info', 'nodes:juju-info' ] -- cgit 1.2.3-korg