openstack
/
tripleo-ansible
Code Issues Proposed changes

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
This commit is contained in:
Jose Luis Franco Arza 2020-04-23 12:49:24 +02:00
parent 1c73d3ac64
commit 4578d6d61c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -31,7 +31,7 @@
run_once: true run_once: true
set_fact: set_fact:
tripleo_hosts_entries_block: | tripleo_hosts_entries_block: |
{% for host in groups['overcloud'] -%} {% for host in groups['allovercloud'] -%}
{{ hostvars[host][hostvars[host]['hostname_resolve_network'] ~ '_ip'] ~ ' ' ~ {{ hostvars[host][hostvars[host]['hostname_resolve_network'] ~ '_ip'] ~ ' ' ~
host ~ '.' ~ cloud_domain ~ ' ' ~ host }} host ~ '.' ~ cloud_domain ~ ' ' ~ host }}
{# ## NOTE(hjensas): The Undercloud Minion has no networks, need to check for that here. -#} {# ## 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
View File

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

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

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

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

@ -47,7 +47,7 @@
run_once: true run_once: true
set_fact: set_fact:
ssh_known_hosts_lines: |- ssh_known_hosts_lines: |-
{% for host in groups['overcloud'] | intersect(play_hosts) %} {% for host in groups['allovercloud'] | intersect(play_hosts) %}
{% set hostdata = hostvars[host] %} {% set hostdata = hostvars[host] %}
{% if 'ansible_ssh_host_key_rsa_public' in hostdata %} {% if 'ansible_ssh_host_key_rsa_public' in hostdata %}
{% set entries = [] %} {% set entries = [] %}