From 9a825022ab2c447c1c77fde86c3731d89d1626dd Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 4 Jan 2017 22:56:39 -0600 Subject: modified as per openstack team. Change-Id: Ic14bdf0806d1d5a5bbfecc51284321f2ba99f4e3 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml') 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 %} -- cgit 1.2.3-korg