Merge "Configure Undercloud hostname in the overcloud during upgrade."
This commit is contained in:
commit
bc4ff4443e
|
@ -132,3 +132,12 @@ outputs:
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
when:
|
when:
|
||||||
- (step | int) == 1
|
- (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
|
||||||
|
|
|
@ -136,13 +136,31 @@ outputs:
|
||||||
service_config_settings: {}
|
service_config_settings: {}
|
||||||
|
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
- name: Run podman install
|
||||||
|
when:
|
||||||
|
- step|int == 1
|
||||||
|
block:
|
||||||
|
- name: Set container_registry_insecure_registries fact.
|
||||||
|
set_fact:
|
||||||
|
container_registry_insecure_registries:
|
||||||
|
if:
|
||||||
|
- insecure_registry_is_empty
|
||||||
|
- []
|
||||||
|
- {get_param: DockerInsecureRegistryAddress}
|
||||||
|
- include_role:
|
||||||
|
name: tripleo-podman
|
||||||
|
tasks_from: tripleo_podman_install.yml
|
||||||
|
vars_from: "redhat.yml"
|
||||||
|
vars:
|
||||||
|
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"
|
||||||
|
|
||||||
- name: system_upgrade_prepare step 2
|
- name: system_upgrade_prepare step 2
|
||||||
tags:
|
tags:
|
||||||
- never
|
- never
|
||||||
- system_upgrade
|
- system_upgrade
|
||||||
- system_upgrade_prepare
|
- system_upgrade_prepare
|
||||||
when:
|
when:
|
||||||
- (step | int) == 2
|
- step|int == 2
|
||||||
block:
|
block:
|
||||||
- name: Check if pcs is present
|
- name: Check if pcs is present
|
||||||
stat:
|
stat:
|
||||||
|
@ -163,14 +181,6 @@ outputs:
|
||||||
- system_upgrade
|
- system_upgrade
|
||||||
- system_upgrade_prepare
|
- system_upgrade_prepare
|
||||||
|
|
||||||
- name: Run podman install
|
|
||||||
when:
|
|
||||||
- (step | int) == 1
|
|
||||||
include_role:
|
|
||||||
name: tripleo_podman
|
|
||||||
tasks_from: tripleo_podman_install.yml
|
|
||||||
vars_from: "redhat.yml"
|
|
||||||
|
|
||||||
post_upgrade_tasks:
|
post_upgrade_tasks:
|
||||||
- name: Purge everything about docker on the host
|
- name: Purge everything about docker on the host
|
||||||
when:
|
when:
|
||||||
|
|
Loading…
Reference in New Issue