openstack
/
openstack-ansible-os_murano
Code Issues Proposed changes

Use ansible_facts[] instead of fact variables 

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

Change-Id: Icea956af90672dae1d50e84f727b2772fd35e26f
This commit is contained in:
Jonathan Rosser 2021-03-15 18:30:20 +00:00 committed by Dmitriy Rabotyagov
parent bf793973ac
commit 10dcc2b5fc
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -78,7 +78,7 @@ murano_services:
# Murano uWSGI settings
murano_wsgi_processes_max: 16
murano_wsgi_processes: "{{ [[ansible_processor_vcpus|default(1), 1] | max * 2, murano_wsgi_processes_max] | min }}"
murano_wsgi_processes: "{{ [[ansible_facts['processor_vcpus']|default(1), 1] | max * 2, murano_wsgi_processes_max] | min }}"
murano_wsgi_threads: 1
# RPC
@ -130,7 +130,7 @@ murano_paste_conf_overrides: {}
# Service setup
murano_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
murano_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((murano_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
murano_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((murano_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
murano_service_name: murano
murano_service_type: application-catalog
murano_service_description: OpenStack Application Catalog service

4
handlers/main.yml
View File

@ -18,7 +18,7 @@
name: "{{ item.service_name }}"
enabled: yes
state: "stopped"
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
daemon_reload: yes
with_items: "{{ filtered_murano_services }}"
register: _stop
until: _stop is success
@ -33,7 +33,7 @@
name: "{{ item.service_name }}"
enabled: yes
state: "started"
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
daemon_reload: yes
with_items: "{{ filtered_murano_services }}"
register: _start
until: _start is success

2
meta/main.yml
View File

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

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

4
tasks/murano_install.yml
View File

@ -61,8 +61,8 @@
package:
name: "{{ murano_package_list }}"
state: "{{ murano_package_state }}"
update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}"
register: install_packages
until: install_packages is success
retries: 5