From c87dcebfe01e31bb289bf57a9656febaac112916 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Fri, 8 Jan 2021 17:18:17 +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: I295b6f99422ba81d14a04129939648d0722dd584
---
 defaults/main.yml              | 12 ++++++------
 tasks/magnum_service_setup.yml |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d7ca16d..726dacd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -20,7 +20,7 @@ debug: False
 magnum_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}"
 
 # Enable/Disable Ceilometer
-magnum_ceilometer_enabled: False
+magnum_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
 
 # Set the host which will execute the shade modules
 # for the service setup. The host must already have
@@ -28,10 +28,9 @@ magnum_ceilometer_enabled: False
 magnum_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
 magnum_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((magnum_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
 
-# Set the package install state for distribution and pip packages
+# Set the package install state for distribution packages
 # Options are 'present' and 'latest'
-magnum_package_state: "latest"
-magnum_pip_package_state: "latest"
+magnum_package_state: "{{ package_state | default('latest') }}"
 
 magnum_system_group_name: magnum
 magnum_system_user_name: magnum
@@ -47,7 +46,7 @@ magnum_service_description: "OpenStack Containers (Magnum)"
 magnum_service_project_name: service
 magnum_service_role_names:
   - admin
-magnum_service_region: RegionOne
+magnum_service_region: "{{ service_region | default('RegionOne') }}"
 magnum_barbican_service_region: "{{ magnum_service_region }}"
 magnum_cinder_service_region: "{{ magnum_service_region }}"
 magnum_glance_service_region: "{{ magnum_service_region }}"
@@ -63,6 +62,7 @@ magnum_service_internaluri_proto: "{{ openstack_service_internaluri_proto | defa
 magnum_service_internalurl: "{{ magnum_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
 magnum_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
 magnum_service_adminurl: "{{ magnum_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
+magnum_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}"
 
 magnum_config_overrides: {}
 magnum_policy_overrides: {}
@@ -91,7 +91,7 @@ magnum_galera_database_name: magnum_service
 magnum_galera_user: magnum
 magnum_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
 magnum_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
-magnum_galera_port: 3306
+magnum_galera_port: "{{ galera_port | default('3306') }}"
 
 # Oslo Messaging vars
 # RPC
diff --git a/tasks/magnum_service_setup.yml b/tasks/magnum_service_setup.yml
index 0d4df78..4d9b5f5 100644
--- a/tasks/magnum_service_setup.yml
+++ b/tasks/magnum_service_setup.yml
@@ -25,6 +25,7 @@
     _service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}"
     _service_setup_host: "{{ magnum_service_setup_host }}"
     _service_setup_host_python_interpreter: "{{ magnum_service_setup_host_python_interpreter }}"
+    _service_in_ldap: "{{ magnum_service_in_ldap }}"
     _service_project_name: "{{ magnum_service_project_name }}"
     _service_region: "{{ magnum_service_region }}"
     _service_users: |-