Browse Source

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

Change-Id: I80a00b3d7d11921306f86efc8023aa89500d4f3e
changes/73/722273/2
Jose Luis Franco Arza 2 years ago
parent
commit
4578d6d61c
  1. 2
      tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml
  2. 2
      tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml
  3. 2
      tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml
  4. 2
      tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml
  5. 2
      tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml

2
tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml

@ -57,7 +57,7 @@ provisioner:
InternalApi:
name_lower: internal_api
children:
overcloud:
allovercloud:
hosts:
centos8:
hostname_resolve_network: ctlplane

2
tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml

@ -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. -#}

2
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml

@ -34,7 +34,7 @@ provisioner:
hosts:
all:
children:
overcloud:
allovercloud:
hosts:
centos8:
ansible_ssh_host_key_rsa_public: AAAATEST

2
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml

@ -34,7 +34,7 @@ provisioner:
hosts:
all:
children:
overcloud:
allovercloud:
hosts:
centos8:
ansible_ssh_host_key_rsa_public: AAAATEST

2
tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml

@ -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) %}
{% set hostdata = hostvars[host] %}
{% if 'ansible_ssh_host_key_rsa_public' in hostdata %}
{% set entries = [] %}

Loading…
Cancel
Save