From 3663f0a4d58783cd54905320bba9ebce33be1e65 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 7 Nov 2017 23:40:00 -0600 Subject: modified to replace neutron with openstack commands. Added intel pod19 labconfig as well. updated with comments. Change-Id: I206da5afdfc1ed73f6fd589853bbbdf2bcc27e07 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundlek8_tpl/relations.yaml | 4 ++++ 1 file changed, 4 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 42c9e136..602fbaad 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml @@ -10,6 +10,10 @@ {% if k8.network.controller == 'ovn' %} - [ 'ovn:cni', 'kubernetes-master:cni' ] - [ 'ovn:cni', 'kubernetes-worker:cni' ] +{% elif k8.network.controller == 'canal' %} + - [ 'canal:etcd', 'etcd:db' ] + - [ 'canal:cni', 'kubernetes-master:cni' ] + - [ 'canal:cni', 'kubernetes-worker:cni' ] {% else %} - [ 'flannel:etcd', 'etcd:db' ] - [ 'flannel:cni', 'kubernetes-master:cni' ] -- cgit 1.2.3-korg