added ssl support based on default.

[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 823e251..f7ea60a 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -15,20 +15,23 @@
         openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
         region: *openstack-region
-        neutron-security-groups: true
+        neutron-security-groups: True
         worker-multiplier: *worker-multiplier
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.neutron }}
+        vip: *neutron-api-vip
 {% endif %}
 {% if os.network.controller == 'nosdn' %}
         flat-network-providers: physnet1
 {% if os.network.dvr %}
         overlay-network-type: vxlan
+        enable-dvr: True
+        l2-population: True
+        enable-l3ha: True
 {% else %}
-        overlay-network-type: vxlan gre
+        overlay-network-type: vxlan
         default-tenant-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
@@ -41,11 +44,16 @@
         flat-network-providers: physnet1
         manage-neutron-plugin-legacy-mode: False
 {% endif %}
-{% if os.network.dvr %}
-        enable-dvr: true
-{% endif %}
 {% if os.network.l2_population %}
         l2-population: true
+{% endif %}
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_neutron_public
+        os-internal-hostname: *hostname_neutron_public
+        os-admin-hostname: *hostname_neutron_public
 {% endif %}
       to:
 {% for unit_id in to_select() %}