modified to accomodate OCL

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / neutron-api.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index 863715d..620cc02 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -3,24 +3,24 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
-{% if opnfv.spaces_dict.data is defined %}
-        admin: admin
-{% else %}
-        admin: internal
-{% endif %}
+        internal: internal-api
+        admin: internal-api
+        shared-db: internal-api
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
         openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.git_repo.origin_git %}
+        openstack-origin-git: "{{ os.git_repo.branch }}"
+{% endif %}
         region: {{ os.region }}
         neutron-security-groups: true
 {% if os.beta.public_api %}
-        use-internal-endpoints: true
+        #use-internal-endpoints: true
 {% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
@@ -35,6 +35,9 @@
         flat-network-providers: physnet1
 {% if os.network.dvr %}
         overlay-network-type: vxlan
+{% else %}
+        overlay-network-type: vxlan gre
+        default-tenant-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False