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 72ad0bb..620cc02 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -4,21 +4,19 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: internal-api
 {% if opnfv.spaces_dict.public is defined %}
         public: public-api
-{% if opnfv.spaces_dict.data is defined %}
-        admin: admin-api
-{% else %}
-        admin: internal-api
-{% endif %}
 {% else %}
         public: internal-api
-        admin: 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 %}
@@ -37,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