Browse Source

Merge "Properly place undercloud hosts record upgrade task" into stable/train

changes/11/719011/1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
6e25ad98eb
2 changed files with 7 additions and 9 deletions
  1. +0
    -9
      deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml
  2. +7
    -0
      deployment/podman/podman-baremetal-ansible.yaml

+ 0
- 9
deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml View File

@@ -132,12 +132,3 @@ outputs:
{% endfor %}
when:
- (step | int) == 1
upgrade_tasks:
- name: Make sure the Undercloud hostname is included in /etc/hosts
when:
- step|int == 1
- undercloud_hosts_entries is defined
lineinfile:
dest: /etc/hosts
line: "{{ '{{ ' }} undercloud_hosts_entries | join('') {{ ' }}' }}"
state: present

+ 7
- 0
deployment/podman/podman-baremetal-ansible.yaml View File

@@ -160,6 +160,13 @@ outputs:
when:
- step|int == 1
block:
- name: Make sure the Undercloud hostname is included in /etc/hosts
when:
- undercloud_hosts_entries is defined
lineinfile:
dest: /etc/hosts
line: "{{ undercloud_hosts_entries | join('') }}"
state: present
- name: Set container_registry_insecure_registries fact.
set_fact:
container_registry_insecure_registries:


Loading…
Cancel
Save