From cfa854fd067685d28ef51adc5a2c57514b9f354f Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <noonedeadpunk@ya.ru>
Date: Fri, 8 Jan 2021 16:46:52 +0200
Subject: [PATCH] Use global service variables

Instead of overriding each service separatelly it might make
sense for deployers to define some higher level variable that
will be used first or fallback to default variable.

Change-Id: I022d52c39c706fd9f82b9efcdcdc589a2e971d24
---
 defaults/main.yml | 17 ++++++++---------
 tasks/main.yml    |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index f8fc9cf..fa1b0ef 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -29,15 +29,12 @@ gnocchi_venv_python_executable: "{{ openstack_venv_python_executable | default('
 #: Enable for debug logging level
 debug: false
 
-# Set the package install state for distribution and pip packages
+# Set the package install state for distribution packages
 # Options are 'present' and 'latest'
-gnocchi_package_state: "latest"
-gnocchi_pip_package_state: "latest"
+gnocchi_package_state: "{{ package_state | default('latest') }}"
 
 # Toggle keystone authentication for gnocchi
-# TODO: (andymccr) Remove the gnocchi_keystone_auth var in Queen cycle.
-gnocchi_keystone_auth: no
-gnocchi_auth_mode: "{{ (gnocchi_keystone_auth | bool) | ternary('keystone', 'basic') }}"
+gnocchi_auth_mode: "keystone"
 
 # These variables are used in 'developer mode' in order to allow the role
 # to build an environment directly from a git source without the presence
@@ -55,7 +52,7 @@ gnocchi_pip_install_args: "{{ pip_install_options | default('') }}"
 gnocchi_fatal_deprecations: false
 
 #: External SSL forwarding proto, assumes TLS termination at load balancer
-gnocchi_ssl_external: true
+gnocchi_ssl_external: "{{ openstack_external_ssl | default(True) }}"
 gnocchi_secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
 
 #: Name of the virtual env to deploy into
@@ -78,7 +75,7 @@ gnocchi_galera_user: gnocchi
 gnocchi_db_sync_options: ""
 gnocchi_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
 gnocchi_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
-gnocchi_galera_port: 3306
+gnocchi_galera_port: "{{ galera_port | default('3306') }}"
 
 #: Storage info
 gnocchi_storage_driver: file
@@ -102,7 +99,7 @@ gnocchi_service_description: "OpenStack Metric Service"
 gnocchi_service_project_description: "OpenStack Services"
 gnocchi_keystone_auth_plugin: "{{ gnocchi_keystone_auth_type }}"
 gnocchi_keystone_auth_type: password
-gnocchi_service_region: RegionOne
+gnocchi_service_region: "{{ service_region | default('RegionOne') }}"
 gnocchi_service_user_name: gnocchi
 gnocchi_role_name: admin
 gnocchi_service_project_name: "{{ (gnocchi_storage_driver == 'swift') | ternary('gnocchi_swift', 'service') }}"
@@ -122,6 +119,8 @@ gnocchi_service_internalurl: "{{ gnocchi_service_internaluri }}"
 gnocchi_service_adminuri: "{{ gnocchi_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ gnocchi_service_port }}"
 gnocchi_service_adminurl: "{{ gnocchi_service_adminuri }}"
 
+gnocchi_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}"
+
 ## uWSGI setup
 gnocchi_wsgi_threads: 1
 gnocchi_wsgi_processes_max: 16
diff --git a/tasks/main.yml b/tasks/main.yml
index 8caeb9d..8eca52d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -103,6 +103,7 @@
     _service_setup_host: "{{ gnocchi_service_setup_host }}"
     _service_setup_host_python_interpreter: "{{ gnocchi_service_setup_host_python_interpreter }}"
     _service_region: "{{ gnocchi_service_region }}"
+    _service_in_ldap: "{{ gnocchi_service_in_ldap }}"
     _service_endpoints:
       - service: "{{ gnocchi_service_name }}"
         interface: "public"