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 c7789d8..f7ea60a 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -1,38 +1,38 @@
     neutron-api:
       charm: "./{{ ubuntu.release }}/neutron-api"
       num_units: {{ unit_qty() }}
+{% 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
+        public: *public-space
+        admin: *admin-space
+        internal: *internal-space
+        shared-db: *internal-space
 {% endif %}
       options:
-        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-        region: {{ os.region }}
-        neutron-security-groups: true
-{% if os.beta.public_api %}
-        use-internal-endpoints: true
+        openstack-origin: *openstack-origin
+{% if os.git_repo.origin_git %}
+        openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
+        region: *openstack-region
+        neutron-security-groups: True
+        worker-multiplier: *worker-multiplier
 {% 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 }}
+        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
+        default-tenant-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False
@@ -40,15 +40,20 @@
 {% elif os.network.controller == 'onos' %}
         flat-network-providers: physnet1
         manage-neutron-plugin-legacy-mode: False
-{% endif %}
-{% if os.beta.public_api %}
-        os-public-hostname: api.{{ opnfv.domain }}
-{% endif %}
-{% if os.network.dvr %}
-        enable-dvr: true
+{% elif os.network.controller == 'ocl' %}
+        flat-network-providers: physnet1
+        manage-neutron-plugin-legacy-mode: False
 {% 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() %}