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>

3 files changed, 14 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 %}
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/canal.yaml b/ci/config_tpl/juju2/bundlek8_tpl/canal.yaml
new file mode 100644
index 00000000..2b130652
--- /dev/null
+++ b/ci/config_tpl/juju2/bundlek8_tpl/canal.yaml
@@ -0,0 +1,8 @@
+
+    canal:
+      charm: "cs:~containers/canal-6"
+{% if os.service.bindings %}
+      bindings:
+        "": *oam-space
+{% endif %}
+
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' ]