adding support for Newton and correct provide type.

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

diff --git a/ci/config_tpl/bundle_tpl/neutron-api.yaml b/ci/config_tpl/bundle_tpl/neutron-api.yaml
index 9ee914a..dd477bd 100644 (file)
--- a/ci/config_tpl/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml
@@ -2,23 +2,41 @@
       charm: "local:{{ ubuntu.release }}/neutron-api"
       num_units: {{ unit_qty() }}
       options:
+        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        region: {{ os.region }}
         neutron-security-groups: true
+{% if os.beta.public_api %}
+        use-internal-endpoints: true
+{% endif %}
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
+{% if os.api.worker_multiplier %}
+        worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
+{% if os.ha.mode == 'ha' %}
+        vip: {{ opnfv.vip.neutron }}
+{% endif %}
 {% if os.network.controller == 'nosdn' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
 {% if os.network.dvr %}
         overlay-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False
+        flat-network-providers: physnet1
 {% elif os.network.controller == 'onos' %}
-        flat-network-providers: "*"
+        flat-network-providers: physnet1
         manage-neutron-plugin-legacy-mode: False
 {% endif %}
-{% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.neutron }}
-{% endif %}
 {% if os.beta.public_api %}
         os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
+{% if os.network.dvr %}
+        enable-dvr: true
+{% endif %}
+{% if os.network.l2_population %}
+        l2-population: true
 {% endif %}
       to:
 {% for unit_id in to_select() %}