summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/bundle_tpl/neutron-gateway.yaml5
-rw-r--r--ci/bundle_tpl/neutron-ovs.yaml7
-rw-r--r--ci/bundle_tpl/phase2-overrides.yaml3
-rw-r--r--ci/bundle_tpl/subordinate.yaml13
4 files changed, 23 insertions, 5 deletions
diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml
index c5678a0f..6b7d19a1 100644
--- a/ci/bundle_tpl/neutron-gateway.yaml
+++ b/ci/bundle_tpl/neutron-gateway.yaml
@@ -1,6 +1,11 @@
neutron-gateway:
charm: "local:{{ ubuntu.release }}/neutron-gateway"
options:
+{% if opnfv.spaces_dict.data is defined %}
+ os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% else %}
+ #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% endif %}
{% if opnfv.ext_port is defined %}
ext-port: {{ opnfv.ext_port }}
{% endif %}
diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml
index 446c6f25..a5b92532 100644
--- a/ci/bundle_tpl/neutron-ovs.yaml
+++ b/ci/bundle_tpl/neutron-ovs.yaml
@@ -1,7 +1,12 @@
neutron-openvswitch:
charm: local:{{ ubuntu.release }}/neutron-openvswitch
-{% if os.network.dpdk %}
options:
+{% if opnfv.spaces_dict.data is defined %}
+ os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% else %}
+ #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% endif %}
+{% if os.network.dpdk %}
enable-dpdk: true
#dpdk-driver: uio_pci_generic
#data-port: ""
diff --git a/ci/bundle_tpl/phase2-overrides.yaml b/ci/bundle_tpl/phase2-overrides.yaml
index dd44ab56..03bf9812 100644
--- a/ci/bundle_tpl/phase2-overrides.yaml
+++ b/ci/bundle_tpl/phase2-overrides.yaml
@@ -1,6 +1,3 @@
-{% if opnfv.spaces_dict.data is defined %}
- os-data-network: {{ opnfv.spaces_dict.data.cidr }}
-{% endif %}
{% if opnfv.spaces_dict.storage is defined %}
#ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
{% endif %}
diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml
index 6f654455..aea5232c 100644
--- a/ci/bundle_tpl/subordinate.yaml
+++ b/ci/bundle_tpl/subordinate.yaml
@@ -14,6 +14,12 @@
security-groups: True
openvswitch-odl:
charm: local:{{ ubuntu.release }}/openvswitch-odl
+ options:
+{% if opnfv.spaces_dict.data is defined %}
+ os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% else %}
+ #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% endif %}
{% elif os.network.controller == 'onos' %}
neutron-api-onos:
charm: local:{{ ubuntu.release }}/neutron-api-onos
@@ -22,8 +28,13 @@
security-groups: True
openvswitch-onos:
charm: local:{{ ubuntu.release }}/openvswitch-onos
-{% if os.network.sfc %}
options:
+{% if opnfv.spaces_dict.data is defined %}
+ os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% else %}
+ #os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% endif %}
+{% if os.network.sfc %}
profile: onos-sfc
{% endif %}
{% elif os.network.controller == 'ocl' %}