Merge "Use ansible_facts[] instead of fact variables"

defaults/main.yml

@@ -21,7 +21,7 @@ manila_package_state: "{{ package_state | default('latest') }}"
 # for the service setup. The host must already have
 # clouds.yaml properly configured.
 manila_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
-manila_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((manila_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
+manila_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((manila_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
 
 # Set installation method.
 manila_install_method: "{{ service_install_method | default('source') }}"
@@ -52,7 +52,7 @@ manila_fatal_deprecations: False
 
 ## Database info
 manila_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
-manila_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((manila_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
+manila_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((manila_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
 manila_galera_address: "{{ galera_address | default('127.0.0.1') }}"
 manila_galera_user: manila
 manila_galera_database: manila
@@ -161,7 +161,7 @@ manila_service_data_program_enabled: false
 
 ## Cap the maximun number of threads / workers when a user value is unspecified.
 manila_osapi_share_workers_max: 16
-manila_osapi_share_workers: "{{ [[(ansible_processor_vcpus//ansible_processor_threads_per_core)|default(1), 1] | max * 2, manila_osapi_share_workers_max] | min }}"
+manila_osapi_share_workers: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, manila_osapi_share_workers_max] | min }}"
 
 ## Manila RPC
 manila_rpc_executor_thread_pool_size: 64
@@ -275,7 +275,7 @@ manila_services:
     #condition: "{{ manila_service_data_program_enabled | bool }}"
 # Manila uWSGI settings
 manila_wsgi_processes_max: 16
-manila_wsgi_processes: "{{ [[ansible_processor_vcpus|default(1), 1] | max * 2, manila_wsgi_processes_max] | min }}"
+manila_wsgi_processes: "{{ [[ansible_facts['processor_vcpus']|default(1), 1] | max * 2, manila_wsgi_processes_max] | min }}"
 manila_wsgi_threads: 1
 manila_wsgi_buffer_size: 65535
 

handlers/main.yml

@@ -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_manila_services }}"
   register: _stop
   until: _stop  is success
@@ -42,7 +42,7 @@
     name: "{{ item.service_name }}"
     enabled: yes
     state: "started"
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
   with_items: "{{ filtered_manila_services }}"
   register: _start
   until: _start  is success

meta/main.yml

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

tasks/main.yml

@@ -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
 

tasks/manila_backends.yml

@@ -33,7 +33,7 @@
 
 - name: Add in manila devices types
   shell: |
-    . {{ ansible_env.HOME }}/openrc
+    . {{ ansible_facts['env']['HOME'] }}/openrc
     CLI_OPTIONS="--endpoint-type internalURL {{ ((keystone_service_adminuri_insecure | bool) or (manila_service_internaluri_insecure | bool)) | ternary('--insecure','') }}"
     if ! {{ manila_bin }}/manila ${CLI_OPTIONS} type-list | grep -q "{{ item.key }}"; then
       {{ manila_bin }}/manila ${CLI_OPTIONS} type-create "{{ item.key }}" "{{ item.value.driver_handles_share_servers }}"

tasks/manila_install.yml

@@ -29,8 +29,8 @@
   package:
     name: "{{ manila_package_list }}"
     state: "{{ manila_package_state }}"
-    update_cache: "{{ (ansible_pkg_mgr == 'apt') | 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