summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml15
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml5
2 files changed, 4 insertions, 16 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
index c240cb74..16b4b1ca 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
@@ -1,26 +1,15 @@
neutron-gateway:
charm: "./{{ ubuntu.release }}/neutron-gateway"
num_units: 1
- bindings:
- internal: internal
{% if opnfv.spaces_dict.data is defined %}
- admin: admin
-{% else %}
- admin: internal
-{% endif %}
-{% if opnfv.spaces_dict.public is defined %}
- public: public
-{% else %}
- public: internal
+ bindings:
+ data: admin
{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if os.api.worker_multiplier %}
worker-multiplier: {{ os.api.worker_multiplier }}
{% endif %}
-{% if opnfv.spaces_dict.data is defined %}
- os-data-network: {{ opnfv.spaces_dict.data.cidr }}
-{% endif %}
{% if os.network.controller == 'nosdn' %}
{% if opnfv.ext_port is defined %}
{% if opnfv.data_port is defined %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index 266ac709..21155c49 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -2,7 +2,8 @@
charm: ./{{ ubuntu.release }}/neutron-openvswitch
options:
{% if opnfv.spaces_dict.data is defined %}
- os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+ bindings:
+ data: admin
{% endif %}
{% if os.network.dpdk %}
enable-dpdk: true
@@ -12,7 +13,6 @@
#default-socket-cores: 1
{% endif %}
{% if opnfv.ext_port is defined %}
-{% if os.network.dvr %}
{% if os.network.controller == 'nosdn' %}
{% if opnfv.data_port is defined %}
bridge-mappings: physnet1:br-ex physnet2:br-data
@@ -25,5 +25,4 @@
ext-port: {{ opnfv.ext_port }}
{% endif %}
{% endif %}
-{% endif %}
{# Empty block to avoid bad block trim #}