summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/spaces.yaml19
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml2
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml2
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml4
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml4
-rw-r--r--ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml5
7 files changed, 22 insertions, 16 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
index 588eeb2b..e27b0d48 100644
--- a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml
@@ -105,7 +105,7 @@
charm: ./{{ ubuntu.release }}/contrail-keystone-auth
num_units: 1
bindings:
- "": internal-api
+ "": *oam-space
to:
- "lxd:nodes/0"
diff --git a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
index 63f624f3..73096ef5 100644
--- a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
@@ -11,24 +11,29 @@
data-port: &data-port br-data:{{ opnfv.ext_port }}
# OAM - Operations, Administration and Maintenance
-{% if opnfv.spaces_dict.pxe is defined %}
- oam-space: &oam-space oam-space
-{% else %}
oam-space: &oam-space internal-api
-{% endif %}
+ # This is OpenStack Internal network; for internalURL endpoints
# This is OpenStack Admin network; for adminURL endpoints
+{% if opnfv.spaces_dict.osapi is defined %}
+ internal-space: &internal-space os-api
+ admin-space: &admin-space os-api
+{% else %}
+ internal-space: &internal-space internal-api
admin-space: &admin-space internal-api
+{% endif %}
+
# This is OpenStack Public network; for publicURL endpoints
{% if opnfv.spaces_dict.public is defined %}
public-space: &public-space public-api
{% else %}
+{% if opnfv.spaces_dict.osapi is defined %}
+ public-space: &public-space os-api
+{% else %}
public-space: &public-space internal-api
{% endif %}
-
- # This is OpenStack Internal network; for internalURL endpoints
- internal-space: &internal-space internal-api
+{% endif %}
# This is the overlay network
{% if opnfv.spaces_dict.data is defined %}
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"
+