summaryrefslogtreecommitdiffstats
path: root/ci/bundle_tpl/subordinate.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/bundle_tpl/subordinate.yaml')
-rw-r--r--ci/bundle_tpl/subordinate.yaml13
1 files changed, 12 insertions, 1 deletions
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' %}