7 files changed, 16 insertions, 8 deletions
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
index 96a27cfb..b4ed14ac 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml
@@ -6,6 +6,8 @@
 # deployment before moving to production.
 #
   series: {{ ubuntu.release }}
+  variables:
+{% include 'spaces.yaml' %}
   services:
     nodes:
       charm: "cs:{{ ubuntu.release }}/ubuntu"
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
index ea46e424..87802a0e 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml
@@ -3,7 +3,7 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
+        "": *oam-space
 {% endif %}
       to:
 {% if k8.network.controller == 'ovn' %}
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
index d902adf8..0908e3a1 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml
@@ -11,7 +11,7 @@
 {% endif %}
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
+        "": *oam-space
 {% endif %}
       to:
 {% if k8.network.controller == 'ovn' %}
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml
index 561e0880..79b89c7f 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml
@@ -3,5 +3,5 @@
       charm: cs:~containers/flannel
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
-{% endif %}
-\ No newline at end of file
+        "": *oam-space
+{% endif %}
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml
index 933c1ef7..645ab157 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml
@@ -4,7 +4,7 @@
       expose: true
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
+        "": *oam-space
 {% endif %}
 {% if k8.network.controller == 'ovn' %}
       options:
@@ -23,7 +23,7 @@
       expose: true
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
+        "": *oam-space
 {% endif %}
 {% if k8.network.controller == 'ovn' %}
       options:
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml
index 978c07c9..98def5ae 100644
--- a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml
+++ b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml
@@ -3,7 +3,8 @@
       charm: "cs:~aakashkt/ovn-15"
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
+        "": *oam-space
 {% endif %}
       options:
-        gateway-physical-interface: "none"
-\ No newline at end of file
+        gateway-physical-interface: "none"
+
diff --git a/ci/config_tpl/juju2/bundlek8_tpl/spaces.yaml b/ci/config_tpl/juju2/bundlek8_tpl/spaces.yaml
new file mode 100644
index 00000000..17dbd7da
--- /dev/null
+++ b/ci/config_tpl/juju2/bundlek8_tpl/spaces.yaml
@@ -0,0 +1,5 @@
+
+
+    # OAM - Operations, Administration and Maintenance
+    oam-space:           &oam-space           internal-api
+