X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fconfig_tpl%2Fjuju2%2Fbundle_tpl%2Fneutron-gateway.yaml;h=eedac793587e6a9989adefa09eed2e9aa8b4fb9a;hb=31882813e2b47c840634aa5461d2cb4b8d58a172;hp=c240cb745a3d0dc28242662d32e09ade46fea67b;hpb=d34b7dfbcee799533c25735db0e8aa47f433c0c7;p=joid.git

diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
index c240cb74..eedac793 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
@@ -1,65 +1,31 @@
     neutron-gateway:
       charm: "./{{ ubuntu.release }}/neutron-gateway"
       num_units: 1
+{% if os.service.bindings %}
       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
+        "": *oam-space
+        data: *overlay-space
 {% 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 }}
+        openstack-origin: *openstack-origin
+{% if os.git_repo.origin_git %}
+        openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
+        worker-multiplier: *worker-multiplier
 {% if os.network.controller == 'nosdn' %}
-{% if opnfv.ext_port is defined  %}
-{% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-ex physnet2:br-data
-        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
-{% else %}
-        bridge-mappings: physnet1:br-ex
-        data-port: br-ex:{{ opnfv.ext_port }}
-{% endif %}
-{% endif %}
+        bridge-mappings: physnet1:br-data
+        data-port: *data-port
 {% elif os.network.controller == 'onos' %}
         plugin: onos
-{% if opnfv.ext_port is defined  %}
-{% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-data external:br-ex
-        data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }}
-{% else %}
-        bridge-mappings: external:br-ex
-        data-port: br-ex:{{ opnfv.ext_port }}
-{% endif %}
-{% endif %}
+        bridge-mappings: physnet1:br-data
+        data-port: *data-port
 {% if os.network.sfc %}
         profile: onos-sfc
 {% endif %}
 {% elif os.network.controller == 'odl' %}
         plugin: ovs-odl
-{% if opnfv.ext_port is defined  %}
-{% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-ex physnet2:br-data
-        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
-{% else %}
-        bridge-mappings: physnet1:br-ex
-        data-port: br-ex:{{ opnfv.ext_port }}
-{% endif %}
-{% endif %}
-{% else %}
-{% if opnfv.ext_port is defined  %}
-        ext-port: {{ opnfv.ext_port }}
-{% endif %}
+        bridge-mappings: physnet1:br-data
+        data-port: *data-port
 {% endif %}
         instance-mtu: 1400
       to: