From 066e861391011ac25e26a3e8abdbc92afbf53dcd Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 22 Feb 2021 10:41:46 -0700 Subject: [PATCH] Fix fact definition for deployments For legacy deployment tasks we construct them here in tripleo-common. In order to disable inject facts, we need to fix this here too. Change-Id: I776192717798c9fc3f02c4d358bebed2bada3593 Related-Bug: #1915761 (cherry picked from commit 6af709a65e7814209e5e44f8de14f28c3badc81d) --- tripleo_common/templates/deployments.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tripleo_common/templates/deployments.yaml b/tripleo_common/templates/deployments.yaml index 10b3c2e5e..14c2ad85a 100644 --- a/tripleo_common/templates/deployments.yaml +++ b/tripleo_common/templates/deployments.yaml @@ -6,11 +6,11 @@ - name: Lookup deployment UUID set_fact: - deployment_uuid: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item) | from_yaml | json_query(item_id) }}" + deployment_uuid: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item) | from_yaml | json_query(item_id) }}" - name: Lookup deployment group set_fact: - deployment_group: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item) | from_yaml | json_query(item_group) }}" + deployment_group: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item) | from_yaml | json_query(item_group) }}" - name: Hiera check and diff mode block: @@ -35,7 +35,7 @@ - name: "Template deployment file for {{ item }}" template: - src: "{{ tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item }}" + src: "{{ tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item }}" dest: "/var/lib/heat-config/check-mode/tripleo-config-download/{{ item ~ '-' ~ deployment_uuid }}.rendered" # variable_start/end are overridden since the Heat template must be # valid yaml, so the jinja expression must be wrapped in quotes in the @@ -122,7 +122,7 @@ - name: "Template deployment file for {{ item }}" template: - src: "{{ tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item }}" + src: "{{ tripleo_role_name ~ '/' ~ ansible_facts['hostname'] | lower ~ '/' ~ item }}" dest: "/var/lib/heat-config/tripleo-config-download/{{ item ~ '-' ~ deployment_uuid }}.rendered" # variable_start/end are overridden since the Heat template must be # valid yaml, so the jinja expression must be wrapped in quotes in the