openstack/openstack-ansible-os_tacker
Code Issues Proposed changes

Use ansible_facts[] instead of fact variables

Browse Source 
See https://github.com/ansible/ansible/issues/73654

Change-Id: I964783d5d992feff42021e5a3017d89326ea2e70
This commit is contained in:
Jonathan Rosser 2021-03-16 08:22:12 +00:00
parent c9dde5b317
commit 6c7e6847b7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -29,7 +29,7 @@ tacker_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups
# for the service setup. The host must already have
# clouds.yaml properly configured.
tacker_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
tacker_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((tacker_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
tacker_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((tacker_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
# Set the package install state for distribution packages
# Options are 'present' and 'latest'
@ -92,7 +92,7 @@ tacker_optional_oslomsg_amqp1_pip_packages:
## Database info
tacker_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
tacker_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((tacker_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
tacker_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((tacker_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
tacker_galera_address: "{{ galera_address | default('127.0.0.1') }}"
tacker_galera_database: tacker
tacker_galera_user: tacker

2
handlers/main.yml
View File

@ -20,6 +20,6 @@
name: "{{ tacker_service_name }}"
enabled: yes
state: restarted
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
daemon_reload: yes
listen:
- "venv changed"

2
meta/main.yml
View File

@ -44,4 +44,4 @@ galaxy_info:
dependencies:
- role: apt_package_pinning
when:
- ansible_pkg_mgr == 'apt'
- ansible_facts['pkg_mgr'] == 'apt'

10
tasks/main.yml
View File

@ -19,11 +19,11 @@
- name: Gather variables for each operating system
include_vars: "{{ item }}"
with_first_found:
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_distribution | lower }}.yml"
- "{{ ansible_os_family | lower }}.yml"
- "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
- "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
- "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
- "{{ ansible_facts['distribution'] | lower }}.yml"
- "{{ ansible_facts['os_family'] | lower }}.yml"
tags:
- always