From 8d1fc85744f6a17415ce8e57afd4e8f1a1f7c922 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 19 Feb 2021 08:29:01 -0700 Subject: [PATCH] Use ansible_facts instead In order to ANSIBLE_INJECT_FACT_VARS=False we have to use ansible_facts instead of ansible_* vars. This change switches our distribution and hostname related items to use ansible_facts instead. Change-Id: I49a2c42dcbb74671834f312798367f411c819813 Related-Bug: #1915761 --- common/deploy-steps-tasks.yaml | 6 +++--- common/deploy-steps.j2 | 8 ++++---- common/generate-config-tasks.yaml | 2 +- common/host-container-puppet-tasks.yaml | 4 ++-- .../cinder/cinder-backup-pacemaker-puppet.yaml | 2 +- .../cinder/cinder-volume-pacemaker-puppet.yaml | 2 +- deployment/database/mysql-pacemaker-puppet.yaml | 2 +- deployment/database/redis-pacemaker-puppet.yaml | 2 +- .../novajoin/novajoin-container-puppet.yaml | 6 +++--- deployment/haproxy/haproxy-pacemaker-puppet.yaml | 4 ++-- .../haproxy/haproxy-public-tls-inject.yaml | 2 +- .../ipa/ipaservices-baremetal-ansible.yaml | 4 ++-- .../manila/manila-share-pacemaker-puppet.yaml | 2 +- .../nova/nova-compute-container-puppet.yaml | 16 ++++++++-------- .../octavia/octavia-deployment-config.j2.yaml | 4 ++-- .../octavia/octavia-worker-container-puppet.yaml | 4 ++-- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 6 +++--- ...bbitmq-messaging-notify-pacemaker-puppet.yaml | 2 +- .../rabbitmq-messaging-pacemaker-puppet.yaml | 2 +- .../rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 2 +- .../swift/swift-storage-container-puppet.yaml | 3 ++- deployment/tls/undercloud-tls.yaml | 6 +++--- .../tripleo-packages-baremetal-puppet.yaml | 8 ++++---- deployment/undercloud/undercloud-upgrade.yaml | 4 ++-- 24 files changed, 52 insertions(+), 51 deletions(-) diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml index b310e199f5..9c3a6df157 100644 --- a/common/deploy-steps-tasks.yaml +++ b/common/deploy-steps-tasks.yaml @@ -117,7 +117,7 @@ # Bootstrap tasks - run any tasks that have been defined ######################################################## -- name: "Clean container_puppet_tasks for {{ansible_hostname | lower}} step {{step}}" +- name: "Clean container_puppet_tasks for {{ansible_facts['hostname'] | lower}} step {{step}}" become: true file: path: /var/lib/container-puppet/container-puppet-tasks{{step}}.json @@ -125,11 +125,11 @@ tags: - container_config_tasks -- name: Calculate container_puppet_tasks for {{ansible_hostname | lower}} step {{step}} +- name: Calculate container_puppet_tasks for {{ansible_facts['hostname'] | lower}} step {{step}} set_fact: "{{'host_container_puppet_tasks_' ~ step}}": "{{lookup('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | union([item])}}" loop: "{{container_puppet_tasks.get('step_' ~ step, [])}}" - when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | sort | first | lower) == ansible_hostname | lower + when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | sort | first | lower) == ansible_facts['hostname'] | lower vars: container_puppet_tasks: "{{ lookup('file', tripleo_role_name + '/container_puppet_tasks.yaml', errors='ignore') | default({}, True) | from_yaml }}" tags: diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index a745a52c06..db5c5f5707 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -1123,9 +1123,9 @@ outputs: loop_control: loop_var: step tags: always - # we use ansible_hostname to determine if the host is alive + # we use ansible_facts['hostname'] to determine if the host is alive # or not. - when: ansible_hostname is defined + when: ansible_facts['hostname'] is defined # We don't want to run the scale tasks on dead nodes, to allow # the operator to scale down the cloud no matter the state of # the servers. @@ -1136,9 +1136,9 @@ outputs: msg: "Node is unreachable. No scale tasks will be run." ignore_errors: True tags: always - # we use ansible_hostname to determine if the host is alive + # we use ansible_facts['hostname'] to determine if the host is alive # or not. - when: ansible_hostname is not defined + when: ansible_facts['hostname'] is not defined tags: - scale post_update_steps_tasks: | diff --git a/common/generate-config-tasks.yaml b/common/generate-config-tasks.yaml index 7af8993c57..471edf266e 100644 --- a/common/generate-config-tasks.yaml +++ b/common/generate-config-tasks.yaml @@ -18,7 +18,7 @@ net_host: true no_archive: false puppet_config: "/var/lib/container-puppet/{{ ansible_check_mode | bool | ternary('check-mode/', '') }}container-puppet.json" - short_hostname: "{{ ansible_hostname | lower }}" + short_hostname: "{{ ansible_facts['hostname'] | lower }}" step: "{{ step }}" - name: "Manage Puppet containers (generate config) for step {{ step }} with tripleo-ansible" diff --git a/common/host-container-puppet-tasks.yaml b/common/host-container-puppet-tasks.yaml index 3e206efb91..b172ba5bff 100644 --- a/common/host-container-puppet-tasks.yaml +++ b/common/host-container-puppet-tasks.yaml @@ -1,4 +1,4 @@ -- name: Write container-puppet-tasks json file for {{ansible_hostname | lower}} step {{step}} +- name: Write container-puppet-tasks json file for {{ansible_facts['hostname'] | lower}} step {{step}} no_log: True copy: content: "{{lookup ('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | to_nice_json}}" @@ -21,7 +21,7 @@ net_host: true no_archive: true puppet_config: "/var/lib/container-puppet/{{ ansible_check_mode | bool | ternary('check-mode/', '') }}container-puppet-tasks{{ step }}.json" - short_hostname: "{{ ansible_hostname | lower }}" + short_hostname: "{{ ansible_facts['hostname'] | lower }}" step: "{{ step }}" - name: "Manage Puppet containers (bootstrap tasks) for step {{ step }} with tripleo-ansible" diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 771fec05f7..745f4d0cce 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -290,7 +290,7 @@ outputs: cinder_backup_pcs_res: "{{cinder_backup_pcs_res_result.rc == 0}}" - name: set is_cinder_backup_bootstrap_node fact tags: common - set_fact: is_cinder_backup_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_cinder_backup_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} - name: Update cinder_backup pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 89227b343d..7ae849cbc9 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -279,7 +279,7 @@ outputs: cinder_volume_pcs_res: "{{cinder_volume_pcs_res_result.rc == 0}}" - name: set is_cinder_volume_bootstrap_node fact tags: common - set_fact: is_cinder_volume_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_cinder_volume_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} - name: Update cinder_volume pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 9017b7007b..bddb32b317 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -473,7 +473,7 @@ outputs: galera_pcs_res: "{{galera_pcs_res_result.rc == 0}}" - name: set is_mysql_bootstrap_node fact tags: common - set_fact: is_mysql_bootstrap_node={{mysql_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_mysql_bootstrap_node={{mysql_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} - name: Update galera pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 0479b73cac..fe89713774 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -378,7 +378,7 @@ outputs: - name: Set upgrade redis facts set_fact: redis_pcs_res: "{{redis_pcs_res_result.rc == 0}}" - is_redis_bootstrap_node: "{{redis_short_bootstrap_node_name|lower == ansible_hostname|lower}}" + is_redis_bootstrap_node: "{{redis_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}" - name: Update redis-bundle pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml b/deployment/deprecated/novajoin/novajoin-container-puppet.yaml index 65e19a02e3..aea4c4af7a 100644 --- a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml +++ b/deployment/deprecated/novajoin/novajoin-container-puppet.yaml @@ -235,8 +235,8 @@ outputs: # openssl-perl is installed which provides /etc/pki/CA on RHEL8 - name: Ensure openssl-perl package is present on RHEL8 when: - - ansible_os_family == 'RedHat' - - ansible_distribution_major_version == '8' + - ansible_facts['os_family'] == 'RedHat' + - ansible_facts['distribution_major_version'] is version('8', '==') package: name: openssl-perl state: present @@ -262,6 +262,6 @@ outputs: creates: /etc/ipa/default.conf when: ipa_otp != '' - name: Request kerberos keytab - shell: "/usr/bin/kinit -kt /etc/krb5.keytab && ipa-getkeytab -s $(grep xmlrpc_uri /etc/ipa/default.conf | cut -d/ -f3) -p nova/{{ ansible_nodename }} -k /etc/novajoin/krb5.keytab" + shell: "/usr/bin/kinit -kt /etc/krb5.keytab && ipa-getkeytab -s $(grep xmlrpc_uri /etc/ipa/default.conf | cut -d/ -f3) -p nova/{{ ansible_facts['nodename'] }} -k /etc/novajoin/krb5.keytab" args: creates: /etc/novajoin/krb5.keytab diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index ee93fe86e0..88a7c591c4 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -343,7 +343,7 @@ outputs: block: &haproxy_update_upgrade_facts - name: set is_haproxy_bootstrap_node fact tags: common - set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} when: - haproxy_short_bootstrap_node_name|default(false) - name: Mount TLS cert if needed @@ -458,7 +458,7 @@ outputs: - name: Set upgrade haproxy facts set_fact: haproxy_pcs_res: "{{haproxy_pcs_res_result.rc == 0}}" - is_haproxy_bootstrap_node: "{{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}}" + is_haproxy_bootstrap_node: "{{haproxy_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}" - name: Update haproxy pcs resource bundle for new container image when: diff --git a/deployment/haproxy/haproxy-public-tls-inject.yaml b/deployment/haproxy/haproxy-public-tls-inject.yaml index a250dbe7cb..f9ae2e9382 100644 --- a/deployment/haproxy/haproxy-public-tls-inject.yaml +++ b/deployment/haproxy/haproxy-public-tls-inject.yaml @@ -82,7 +82,7 @@ outputs: path: "{{cert_path}}" - name: set is_haproxy_bootstrap_node fact - set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name | lower == ansible_hostname | lower}} + set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name | lower == ansible_facts['hostname'] | lower}} when: - haproxy_short_bootstrap_node_name|default(false) diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml index e6956e618b..fe4bb73b3d 100644 --- a/deployment/ipa/ipaservices-baremetal-ansible.yaml +++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml @@ -113,9 +113,9 @@ outputs: if: - idm_server_provided - IPA_HOST: {get_param: IdMServer} - IPA_USER: "nova/{{ ansible_fqdn }}" + IPA_USER: "nova/{{ ansible_facts['fqdn'] }}" KRB5_CLIENT_KTNAME: {get_param: IdMNovaKeytab} - - IPA_USER: "nova/{{ ansible_fqdn }}" + - IPA_USER: "nova/{{ ansible_facts['fqdn'] }}" KRB5_CLIENT_KTNAME: {get_param: IdMNovaKeytab} deploy_steps_tasks: - name: enroll the node as an ipa client diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index e74d289c26..545243b675 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -274,7 +274,7 @@ outputs: manila_share_pcs_res: "{{manila_share_pcs_res_result.rc == 0}}" - name: set is_manila_share_bootstrap_node fact tags: common - set_fact: is_manila_share_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_manila_share_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} - name: Update openstack-manila-share pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 8f859d4422..1ba02ba753 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -1480,7 +1480,7 @@ outputs: register: iha_nodes - name: If instance HA is enabled on the node activate the evacuation completed check file: path=/var/lib/nova/instanceha/enabled state=touch - when: iha_nodes.stdout|lower is search('"'+ansible_hostname|lower+'"') + when: iha_nodes.stdout|lower is search('"'+ansible_facts['hostname']|lower+'"') - name: Do we prepend nova startup with a delay set_fact: nova_compute_delay: {get_param: NovaComputeStartupDelay} @@ -1567,21 +1567,21 @@ outputs: name: qemu-kvm-common-ev state: present when: - - ansible_distribution == 'CentOS' - - ansible_distribution_major_version == '7' + - ansible_facts['distribution'] == 'CentOS' + - ansible_facts['distribution_major_version'] is version('7', '==') - name: make sure package providing ksmtuned is installed (RHEL7) package: name: qemu-kvm-common-rhev state: present when: - - ansible_distribution == 'RedHat' - - ansible_distribution_major_version == '7' + - ansible_facts['distribution'] == 'RedHat' + - ansible_facts['distribution_major_version'] is version('7', '==') - name: make sure package providing ksmtuned is installed (RHEL8 or CentOS8) package: name: qemu-kvm-common state: present when: - - ansible_distribution_major_version == '8' + - ansible_facts['distribution_major_version'] is version('8', '==') - name: enable ksmtunded service: name: "{{ item }}" @@ -1637,13 +1637,13 @@ outputs: is_additional_cell: {get_param: NovaAdditionalCell} - name: Set fact for nova_compute services set_fact: - nova_compute_service: "{{ nova_compute_service_result.stdout | from_yaml | selectattr('Host', 'match', ansible_fqdn ~ '.*') | list }}" + nova_compute_service: "{{ nova_compute_service_result.stdout | from_yaml | selectattr('Host', 'match', ansible_facts['fqdn'] ~ '.*') | list }}" delegate_to: localhost check_mode: no - name: Check search output fail: msg: >- - Found multiple `{{ ansible_fqdn }}`, which is unexpected. + Found multiple `{{ ansible_facts['fqdn'] }}`, which is unexpected. This means that the FQDN of the selected device to disable is either wrong or is sharing a name with another host, which is also wrong. Please correct this issue before continuing. Nova diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml index dc47a3168f..37f8beaba4 100644 --- a/deployment/octavia/octavia-deployment-config.j2.yaml +++ b/deployment/octavia/octavia-deployment-config.j2.yaml @@ -301,7 +301,7 @@ outputs: {%- if 'octavia_' ~ octavia_groups %} {% for host in groups['octavia_' ~ octavia_group] -%} - {{ hostvars.raw_get(host)['ansible_hostname'] | lower}}: + {{ hostvars.raw_get(host)['ansible_facts']['hostname'] | lower}}: ansible_user: {{ hostvars.raw_get(host)['ansible_ssh_user'] | default('heat-admin') }} ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) | lower }} canonical_hostname: {{ hostvars.raw_get(host)['canonical_hostname'] | default(host) | lower }} @@ -314,7 +314,7 @@ outputs: Undercloud: hosts: {% for host in groups['Undercloud'] -%} - {{ hostvars.raw_get(host)['ansible_hostname'] | lower}}: + {{ hostvars.raw_get(host)['ansible_facts']['hostname'] | lower}}: ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) | lower }} ansible_become: false ansible_connection: local diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index a5ee68bca6..e22b8a59cd 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -147,7 +147,7 @@ outputs: - python2-openstackclient - openssl state: present - when: ansible_distribution_major_version is version(8, '<') + when: ansible_facts['distribution_major_version'] is version(8, '<') - name: Ensure packages required for configuring octavia are present for CentOS/RHEL 8 package: @@ -156,7 +156,7 @@ outputs: - python3-openstackclient - openssl state: present - when: ansible_distribution_major_version is version(8, '>=') + when: ansible__facts['distribution_major_version'] is version(8, '>=') when: {get_param: EnablePackageInstall} - name: enable virt_sandbox_use_netlink for healthcheck seboolean: diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 1abb68b28a..9bf9565387 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -378,7 +378,7 @@ outputs: - name: Update ovn-dbs-bundle resource to use pcmklatest tag image if not used when: - step|int == 5 - - ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower + - ovn_dbs_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower block: - name: Get the present image used by ovn-dbs-bundle shell: "pcs resource config ovn-dbs-bundle | grep -Eo 'image=[^ ]+' | awk -F= '{print $2;}'" @@ -442,7 +442,7 @@ outputs: - name: Update ovn_dbs pcs resource bundle for new container image when: - step|int == 1 - - ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower + - ovn_dbs_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower - ovn_dbs_pcs_res|bool - ovn_dbs_image_current != ovn_dbs_image_latest block: @@ -524,7 +524,7 @@ outputs: - name: Restart ovn-dbs service (pacemaker) when: - step|int == 1 - - ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower + - ovn_dbs_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower pacemaker_resource: resource: ovn-dbs-bundle state: restart diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 52b15a5cc1..1f2d0d4c24 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -346,7 +346,7 @@ outputs: set_fact: rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}" - name: set is_notify_rabbitmq_bootstrap_node fact - set_fact: is_notify_rabbitmq_bootstrap_node={{oslo_messaging_notify_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_notify_rabbitmq_bootstrap_node={{oslo_messaging_notify_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} - name: Update rabbitmq-bundle pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index e4ab4ac0c7..e86256eb1a 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -347,7 +347,7 @@ outputs: rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}" - name: set is_rabbitmq_bootstrap_node fact tags: common - set_fact: is_rabbitmq_bootstrap_node={{rabbitmq_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_rabbitmq_bootstrap_node={{rabbitmq_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} - name: Update rabbitmq-bundle pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index a05e87e297..fcb530016c 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -346,7 +346,7 @@ outputs: set_fact: rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}" - name: set is_rpc_rabbitmq_bootstrap_node fact - set_fact: is_rpc_rabbitmq_bootstrap_node={{oslo_messaging_rpc_short_bootstrap_node_name|lower == ansible_hostname|lower}} + set_fact: is_rpc_rabbitmq_bootstrap_node={{oslo_messaging_rpc_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}} - name: Update rabbitmq-bundle pcs resource bundle for new container image when: - step|int == 1 diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 420431419e..f87a717d59 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -624,11 +624,12 @@ outputs: - '!all' - '!min' - 'hardware' + filter: 'ansible_device_links' when: swift_raw_disks|length > 0 - name: Mount devices defined in SwiftRawDisks mount: name: /srv/node/{{ item }} - src: "{% if lsblk.results['uuids'][item] is defined %}UUID={{ ansible_device_links['uuids'][item][0] }}{% else %}{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}{% endif %}" + src: "{% if lsblk.results['uuids'][item] is defined %}UUID={{ ansible_facts['device_links']['uuids'][item][0] }}{% else %}{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}{% endif %}" fstype: xfs opts: noatime state: mounted diff --git a/deployment/tls/undercloud-tls.yaml b/deployment/tls/undercloud-tls.yaml index e245054616..9a026756c5 100644 --- a/deployment/tls/undercloud-tls.yaml +++ b/deployment/tls/undercloud-tls.yaml @@ -47,8 +47,8 @@ outputs: # openssl-perl is installed which provides /etc/pki/CA on RHEL8 - name: Ensure openssl-perl package is present on RHEL8 when: - - ansible_os_family == 'RedHat' - - ansible_distribution_major_version == '8' + - ansible_facts['os_family'] == 'RedHat' + - ansible_facts['distribution_major_version'] is version('8', '==') package: name: openssl-perl state: present @@ -68,7 +68,7 @@ outputs: when: ipa_otp != '' - name: Set keytab permission facts set_fact: - nova_service: "nova/{{ ansible_nodename }}" + nova_service: "nova/{{ ansible_facts['nodename'] }}" nova_keytab: "/etc/novajoin/krb5.keytab" nova_keytab_group: "tripleo-admin" - name: Add directory for keytab diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index 14b7ea1599..2c83bb7cb2 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -258,7 +258,7 @@ outputs: state: present loop: "{{ dnf_module_list|list }}" when: - - ansible_distribution_major_version >= '8' + - ansible_facts['distribution_major_version'] is version('8', '>=') - dnf_module_list|length > 0 - name: Ensure TripleO prerequisite packages are installed package: @@ -272,7 +272,7 @@ outputs: - python3-heat-agent* - rsync state: present - when: ansible_distribution_major_version == '8' + when: ansible_facts['distribution_major_version'] is version('8', '==') - name: Special treatment for OpenvSwitch tripleo_ovs_upgrade: when: @@ -350,7 +350,7 @@ outputs: skip_rhel_enforcement: {get_param: SkipRhelEnforcement} when: - step|int == 0 - - ansible_distribution == 'RedHat' + - ansible_facts['distribution'] == 'RedHat' - not (skip_rhel_enforcement | bool) - name: Ensure DNF modules have the right stream vars: @@ -361,7 +361,7 @@ outputs: loop: "{{ dnf_module_list|list }}" when: - step|int == 0 - - ansible_distribution_major_version >= '8' + - ansible_facts['distribution_major_version'] is version('8', '>=') - dnf_module_list|length > 0 - name: Check for existing yum.pid stat: path=/run/yum.pid diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml index 8a0569f120..b9f88f86b3 100644 --- a/deployment/undercloud/undercloud-upgrade.yaml +++ b/deployment/undercloud/undercloud-upgrade.yaml @@ -62,7 +62,7 @@ outputs: skip_rhel_enforcement: {get_param: SkipRhelEnforcement} when: - step|int == 0 - - ansible_distribution == 'RedHat' + - ansible_facts['distribution'] == 'RedHat' - not (skip_rhel_enforcement | bool) - name: Ensure DNF modules have the right stream vars: @@ -73,7 +73,7 @@ outputs: loop: "{{ dnf_module_list|list }}" when: - step|int == 0 - - ansible_distribution_major_version >= '8' + - ansible_facts['distribution_major_version'] is version('8', '>=') - dnf_module_list|length > 0 - name: Special treatment for OpenvSwitch tripleo_ovs_upgrade: