From 6c148e0b1caa129d029346f9bbc8e1b870fcb2d0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 8 Jan 2021 16:32:10 +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: Idec510b7f2302b6db2fe5aba599e3c258043fee0 --- defaults/main.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b175bfa7..f104c7cf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -17,7 +17,7 @@ debug: False # Set installation method -glance_install_method: "source" +glance_install_method: "{{ service_install_method | default('source') }}" glance_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}" # Set the host which will execute the shade modules @@ -26,10 +26,9 @@ glance_venv_python_executable: "{{ openstack_venv_python_executable | default('p glance_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" glance_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((glance_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' -glance_package_state: "latest" -glance_pip_package_state: "latest" +glance_package_state: "{{ package_state | default('latest') }}" glance_git_repo: https://opendev.org/openstack/glance glance_git_install_branch: master @@ -51,7 +50,7 @@ glance_bin: "{{ _glance_bin }}" glance_etc_dir: "/etc/glance" # Enable/Disable Ceilometer -glance_ceilometer_enabled: False +glance_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" glance_profiler_enabled: False glance_fatal_deprecations: False @@ -127,14 +126,14 @@ glance_galera_database: glance glance_galera_user: glance glance_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" glance_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" -glance_galera_port: 3306 +glance_galera_port: "{{ galera_port | default('3306') }}" glance_role_name: admin glance_api_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" glance_api_service_port: 9292 ## Service Type and Data -glance_service_region: RegionOne +glance_service_region: "{{ service_region | default('RegionOne') }}" glance_service_name: glance glance_service_port: 9292 glance_service_proto: http @@ -228,7 +227,7 @@ glance_rbd_store_pool: images glance_rbd_store_user: '{{ glance_ceph_client }}' glance_rbd_store_chunk_size: 8 -glance_service_in_ldap: false +glance_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}" # Common pip packages glance_pip_packages: