From 149e7053b83b2236eac66701837c0d183bb25b81 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 11 Apr 2018 16:34:01 -0500
Subject: added ssl support based on default.

Change-Id: I0198520e43c81d7734bc3b2f4396e55c42d33e5c
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml | 39 ++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 6 deletions(-)

(limited to 'ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml')

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 33bbbd8a..1a6b4cd0 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -1,23 +1,42 @@
     gnocchi:
       charm: ./{{ ubuntu.release }}/gnocchi
-      num_units: 1
+      num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        "": *internal-space
+        "": *oam-space
+        public: *public-space
+        admin: *admin-space
+        internal: *internal-space
 {% endif %}
       options:
         openstack-origin: *openstack-origin
+{% if os.ha.mode == 'ha' %}
+        vip: *gnocchi-vip
+{% endif %}
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_gnocchi_public
+        os-internal-hostname: *hostname_gnocchi_public
+        os-admin-hostname: *hostname_gnocchi_public
+{% endif %}
       to:
-        - "lxd:nodes/0"
+{% for unit_id in to_select() %}
+        - "lxd:nodes/{{ unit_id }}"
+{% endfor %}
     memcached:
       charm: ./{{ ubuntu.release }}/memcached
-      num_units: 1
+      num_units: 2
 {% if os.service.bindings %}
       bindings:
         "": *internal-space
 {% endif %}
+      options:
+        allow-ufw-ip6-softfail: True
       to:
-        - "lxd:nodes/0"
+        - "designate-bind/0"
+        - "designate-bind/1"
     ceilometer:
       charm: "./{{ ubuntu.release }}/ceilometer"
       num_units: {{ unit_qty() }}
@@ -32,7 +51,15 @@
         openstack-origin: *openstack-origin
         region: *openstack-region
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.ceilometer }}
+        vip: *ceilometer-vip
+{% endif %}
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_ceilometer_public
+        os-internal-hostname: *hostname_ceilometer_public
+        os-admin-hostname: *hostname_ceilometer_public
 {% endif %}
       to:
 {% for unit_id in to_select() %}
-- 
cgit 1.2.3-korg