diff --git a/defaults/main.yml b/defaults/main.yml index 29188f2c..af806b08 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -205,14 +205,14 @@ cinder_swift_catalog_info: "object-store:swift:internalURL" ## Cap the maximun number of threads / workers when a user value is unspecified. cinder_osapi_volume_workers_max: 16 -cinder_osapi_volume_workers: "{{ [[(ansible_processor_vcpus//ansible_processor_threads_per_core)|default(1), 1] | max * 2, cinder_osapi_volume_workers_max] | min }}" +cinder_osapi_volume_workers: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, cinder_osapi_volume_workers_max] | min }}" ## Cinder iscsi cinder_target_helper_mapping: RedHat: lioadm Debian: tgtadm Suse: tgtadm -cinder_target_helper: "{{ cinder_target_helper_mapping[ansible_os_family] }}" +cinder_target_helper: "{{ cinder_target_helper_mapping[ansible_facts['os_family']] }}" cinder_iscsi_iotype: fileio cinder_iscsi_num_targets: 100 cinder_iscsi_port: 3260 @@ -347,7 +347,7 @@ cinder_services: # Cinder uWSGI settings cinder_wsgi_processes_max: 16 -cinder_wsgi_processes: "{{ [[ansible_processor_vcpus|default(1), 1] | max * 2, cinder_wsgi_processes_max] | min }}" +cinder_wsgi_processes: "{{ [[ansible_facts['processor_vcpus']|default(1), 1] | max * 2, cinder_wsgi_processes_max] | min }}" cinder_wsgi_threads: 1 # Define the following dictionary variable to enable qos settings on volumes. diff --git a/handlers/main.yml b/handlers/main.yml index 9a05fbb6..2118c5f1 100644 --- a/handlers/main.yml +++ b/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: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}" with_items: "{{ filtered_cinder_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: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}" with_items: "{{ filtered_cinder_services }}" register: _start until: _start is success @@ -48,7 +48,7 @@ name: "{{ tgt_service_name }}" enabled: yes state: restarted - daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}" + daemon_reload: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}" - meta: noop listen: Manage LB diff --git a/meta/main.yml b/meta/main.yml index f7c7381c..275db911 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -42,4 +42,4 @@ galaxy_info: dependencies: - role: apt_package_pinning when: - - ansible_pkg_mgr == 'apt' + - ansible_facts['pkg_mgr'] == 'apt' diff --git a/tasks/cinder_backends.yml b/tasks/cinder_backends.yml index ad6258fe..ec2f03a2 100644 --- a/tasks/cinder_backends.yml +++ b/tasks/cinder_backends.yml @@ -38,7 +38,7 @@ - name: Add in cinder devices types shell: | - . {{ ansible_env.HOME }}/openrc + . {{ ansible_facts['env']['HOME'] }}/openrc CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (keystone_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" if ! {{ cinder_service_setup_host_python_interpreter | dirname }}/openstack ${CLI_OPTIONS} volume type show "{{ item.key }}"; then {{ cinder_service_setup_host_python_interpreter | dirname }}/openstack ${CLI_OPTIONS} volume type create --property volume_backend_name="{{ item.value.volume_backend_name }}" {% if not (item.value.public | default(True)) | bool %} --private {% endif %} "{{ item.key }}" @@ -51,7 +51,7 @@ - name: Add extra cinder volume types shell: | - . {{ ansible_env.HOME }}/openrc + . {{ ansible_facts['env']['HOME'] }}/openrc CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (keystone_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" {% for evtype in item.value.extra_volume_types %} if ! {{ cinder_service_setup_host_python_interpreter | dirname }}/openstack ${CLI_OPTIONS} volume type show "{{ evtype }}"; then diff --git a/tasks/cinder_install.yml b/tasks/cinder_install.yml index 7a069c7a..93254426 100644 --- a/tasks/cinder_install.yml +++ b/tasks/cinder_install.yml @@ -29,8 +29,8 @@ package: name: "{{ cinder_package_list }}" state: "{{ cinder_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'] in ['apt', 'zypper']) | 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 diff --git a/tasks/cinder_qos.yml b/tasks/cinder_qos.yml index b69ea5b1..859f5f2c 100644 --- a/tasks/cinder_qos.yml +++ b/tasks/cinder_qos.yml @@ -15,7 +15,7 @@ - name: Add in cinder qos types shell: | - . {{ ansible_env.HOME }}/openrc + . {{ ansible_facts['env']['HOME'] }}/openrc CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (keystone_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" {{ cinder_service_setup_host_python_interpreter | dirname }}/openstack ${CLI_OPTIONS} volume qos list --format value --column Name | grep -x {{ item.name }} || \ {{ cinder_service_setup_host_python_interpreter | dirname }}/openstack ${CLI_OPTIONS} volume qos create {{ item.name }} \ @@ -31,7 +31,7 @@ - name: Associate qos types to volume types shell: | - . {{ ansible_env.HOME }}/openrc + . {{ ansible_facts['env']['HOME'] }}/openrc CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (keystone_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" {% for vtype in item.cinder_volume_types %} if {{ cinder_service_setup_host_python_interpreter | dirname }}/openstack ${CLI_OPTIONS} volume type show "{{ vtype }}"; then diff --git a/tasks/main.yml b/tasks/main.yml index a0c79604..431d6e19 100644 --- a/tasks/main.yml +++ b/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 @@ -182,8 +182,8 @@ package: name: "{{ cinder_volume_distro_packages_tools }}" state: "{{ cinder_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'] in ['apt', 'zypper']) | 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 diff --git a/vars/redhat.yml b/vars/redhat.yml index 45ba909c..5f59aee0 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -26,7 +26,7 @@ cinder_distro_packages: cinder_service_distro_packages: - openstack-cinder - - "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}" + - "{{ ansible_facts['distribution_major_version'] is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}" cinder_devel_distro_packages: - git @@ -41,7 +41,7 @@ cinder_api_distro_packages: [] cinder_volume_service_distro_packages: [] cinder_volume_distro_packages_tools: - - "qemu-img{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}" + - "qemu-img{% if ansible_facts['distribution_major_version']|int <= 7 %}-ev{% endif %}" cinder_volume_distro_packages: - iscsi-initiator-utils