From 9dc51b5386324dd2353f3b16d6de2681aabc6ec5 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 8 Jan 2021 16:51:18 +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: I73d5e7334c076f4d0dd18b157307aa31cfb541a9 --- defaults/main.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d7d5e4b..627930d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -17,7 +17,7 @@ # These don't have to be explicitly imported by vars_files: they are autopopulated. # Enable/Disable Ceilometer -heat_ceilometer_enabled: False +heat_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" ## Verbosity Options debug: False @@ -28,13 +28,12 @@ debug: False heat_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" heat_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((heat_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' -heat_package_state: "latest" -heat_pip_package_state: "latest" +heat_package_state: "{{ package_state | default('latest') }}" # Set installation method. -heat_install_method: "source" +heat_install_method: "{{ service_install_method | default('source') }}" heat_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}" heat_git_repo: https://opendev.org/openstack/heat @@ -63,7 +62,7 @@ heat_galera_user: heat heat_galera_database: heat heat_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" heat_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" -heat_galera_port: 3306 +heat_galera_port: "{{ galera_port | default('3306') }}" ## Oslo Messaging Info # RPC @@ -121,7 +120,7 @@ heat_profiler_enabled: false heat_profiler_trace_sqlalchemy: false ## Auth -heat_service_region: RegionOne +heat_service_region: "{{ service_region | default('RegionOne') }}" heat_service_project_name: "service" heat_service_user_name: "heat" heat_service_role_name: admin @@ -183,7 +182,7 @@ heat_metadata_server_url: "{{ heat_cfn_service_publicuri_proto }}://{{ external_ heat_api_threads_max: 16 heat_api_threads: "{{ [[(ansible_processor_vcpus//ansible_processor_threads_per_core)|default(1), 1] | max * 2, heat_api_threads_max] | min }}" -heat_service_in_ldap: false +heat_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}" ## Plugin dirs heat_plugin_dirs: