adding bionic support.

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / nova-cloud-controller.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
index 1c373b9..7b9520f 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -9,6 +9,7 @@
         internal: *internal-space
         shared-db: *internal-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
         openstack-origin: *openstack-origin
 {% if os.git_repo.origin_git %}
@@ -21,18 +22,22 @@
         worker-multiplier: *worker-multiplier
         single-nova-consoleauth: False
         network-manager: Neutron
-        use-internal-endpoints: true
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.nova }}
+        vip: *nova-cc-vip
+{% endif %}
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_nova_public
+        os-internal-hostname: *hostname_nova_public
+        os-admin-hostname: *hostname_nova_public
 {% endif %}
 {% if opnfv.domain is defined %}
         #console-proxy-ip: {{ opnfv.domain }}
-{% endif %}
-{% if os.beta.public_api %}
-        os-public-hostname: api.{{ opnfv.domain }}
 {% endif %}
       to:
 {% for unit_id in to_select() %}