openstack
/
openstack-ansible-os_cloudkitty
Code Issues Proposed changes

Use ansible_facts[] instead of fact variables 

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

Change-Id: Ia088d1b4074e3bbcd3054f5be00b39429437750d
This commit is contained in:
Jonathan Rosser 2021-03-15 17:56:59 +00:00
parent 0e29f8545a
commit 2b54345586
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml
View File

@ -23,7 +23,7 @@ cloudkitty_venv_python_executable: "{{ openstack_venv_python_executable | defaul
# for the service setup. The host must already have
# clouds.yaml properly configured.
cloudkitty_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
cloudkitty_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((cloudkitty_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
cloudkitty_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((cloudkitty_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
# Set the package install state for distribution and pip packages
# Options are 'present' and 'latest'
@ -87,7 +87,7 @@ cloudkitty_output_pipeline: osrf
cloudkitty_output_basepath: /var/cloudkitty/reports
cloudkitty_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
cloudkitty_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((cloudkitty_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
cloudkitty_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((cloudkitty_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
cloudkitty_galera_address: "{{ galera_address | default('127.0.0.1') }}"
cloudkitty_galera_database: cloudkitty
cloudkitty_galera_user: cloudkitty
@ -97,7 +97,7 @@ cloudkitty_database_connection: >-
cloudkitty_wsgi_threads: 1
cloudkitty_wsgi_processes_max: 16
cloudkitty_wsgi_processes: "{{ [[(ansible_processor_vcpus//ansible_processor_threads_per_core)|default(1), 1] | max * 2, cloudkitty_wsgi_processes_max] | min }}"
cloudkitty_wsgi_processes: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, cloudkitty_wsgi_processes_max] | min }}"
cloudkitty_uwsgi_bind_address: 0.0.0.0
## Service Type and Data

2
extras/os-cloudkitty-install.yml
View File

@ -20,7 +20,7 @@
- cloudkitty
vars:
cloudkitty_venv_tag: "{{ openstack_release }}"
cloudkitty_venv_download_url: "{{ venv_base_download_url }}/cloudkitty-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
cloudkitty_venv_download_url: "{{ venv_base_download_url }}/cloudkitty-{{ openstack_release }}-{{ ansible_facts['architecture'] | lower }}.tgz"
pre_tasks:
- include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
static: no

10
tasks/main.yml
View File

@ -18,11 +18,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