Change Ansible group from overcloud to allovercloud.
[0] got merged to enable multistack working in the overcloud. This
patch modifies the overcloud group in the inventory and changes its
name into allovercloud. We need to adapt all the calls to the old
overcloud group to work with the new allovercloud instead.
[0] - Ife14dbe04dd11db44a944f98373f63e01dfbb8d8
(cherry picked from commit 4578d6d61c
)
Change-Id: I80a00b3d7d11921306f86efc8023aa89500d4f3e
This commit is contained in:
parent
ecbf4784fd
commit
972e3b82ec
|
@ -57,7 +57,7 @@ provisioner:
|
|||
InternalApi:
|
||||
name_lower: internal_api
|
||||
children:
|
||||
overcloud:
|
||||
allovercloud:
|
||||
hosts:
|
||||
centos8:
|
||||
hostname_resolve_network: ctlplane
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
run_once: true
|
||||
set_fact:
|
||||
tripleo_hosts_entries_block: |
|
||||
{% for host in groups['overcloud'] -%}
|
||||
{% for host in groups['allovercloud'] -%}
|
||||
{{ hostvars[host][hostvars[host]['hostname_resolve_network'] ~ '_ip'] ~ ' ' ~
|
||||
host ~ '.' ~ cloud_domain ~ ' ' ~ host }}
|
||||
{# ## NOTE(hjensas): The Undercloud Minion has no networks, need to check for that here. -#}
|
||||
|
|
|
@ -39,7 +39,7 @@ provisioner:
|
|||
enabled_networks: []
|
||||
role_networks: []
|
||||
children:
|
||||
overcloud:
|
||||
allovercloud:
|
||||
hosts:
|
||||
centos8:
|
||||
ansible_ssh_host_key_rsa_public: AAAATEST
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
run_once: true
|
||||
set_fact:
|
||||
ssh_known_hosts_lines: |-
|
||||
{%- for host in groups['overcloud'] | intersect(play_hosts) %}
|
||||
{%- for host in groups['allovercloud'] | intersect(play_hosts) %}
|
||||
[{{ ctlplane_ip }}]*,[{{ host }}.{{ cloud_domain }}]*,[{{ host }}]*
|
||||
{%- if (enabled_networks and enabled_networks | length > 0 and 'role_networks' in hostvars[host]
|
||||
and hostvars[host]['role_networks'] and hostvars[host]['role_networks'] | length > 0) %},
|
||||
|
|
Loading…
Reference in New Issue