summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-11-07 23:40:00 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-11-10 14:46:55 -0600
commit3663f0a4d58783cd54905320bba9ebce33be1e65 (patch)
treec5154487fca216b5cb7941190441b6b67a7d5511 /ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
parent34dd0b2e19d2d50486364d18c594c87b77ba078e (diff)
modified to replace neutron with openstack commands.
Added intel pod19 labconfig as well. updated with comments. Change-Id: I206da5afdfc1ed73f6fd589853bbbdf2bcc27e07 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml')
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
index ef5bbe37..6d777720 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
@@ -23,6 +23,8 @@
{% if k8.network.controller == 'ovn' %}
{% include 'ovn.yaml' %}
+{% elif k8.network.controller == 'canal' %}
+{% include 'canal.yaml' %}
{% else %}
{% include 'flannel.yaml' %}
{% endif %}