openstack/openstack-ansible-os_rally
Code Issues Proposed changes

Use ansible_facts[] instead of fact variables

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

Change-Id: Iafcd10d169b9515846293731ca1e5b8a7ffb5fe1
This commit is contained in:
Jonathan Rosser 2021-03-16 07:25:36 +00:00
parent dd9bd41c8c
commit 99f087d2e3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -36,7 +36,7 @@ rally_bin: "/openstack/venvs/rally-{{ rally_venv_tag }}/bin"
# Database vars
rally_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
rally_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((rally_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
rally_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((rally_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
rally_galera_address: "{{ galera_address | default('127.0.0.1') }}"
rally_galera_port: 3306
rally_galera_database: rally

2
meta/main.yml
View File

@ -31,5 +31,5 @@ galaxy_info:
dependencies:
- role: apt_package_pinning
when:
- ansible_pkg_mgr == 'apt'
- ansible_facts['pkg_mgr'] == 'apt'
- openstack_openrc

12
tasks/main.yml
View File

@ -16,12 +16,12 @@
- 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
- "{{ ansible_facts['os_family'] | lower }}.yml"
tags:
- always