Get the undercloud.conf file from where it actually is

Since the deprecation of Mistral in THT, we can't get the path of this
file by using hiera anymore. This patch will get it directly in its
original place ($HOME/undercloud.conf) by using *ansible_env.HOME* fact.

Impacted Validations:
 playbooks/ceilometerdb-size.yaml
 playbooks/check-network-gateway.yaml
 playbooks/check-undercloud-conf.yaml
 playbooks/container-status.yaml
 playbooks/ctlplane-ip-range.yaml
 playbooks/dhcp-provisioning.yaml
 playbooks/neutron-sanity-check.yaml
 playbooks/tls-everywhere-pre-deployment.yaml
 playbooks/tls-everywhere-prep.yaml
 playbooks/undercloud-heat-purge-deleted.yaml
 playbooks/undercloud-process-count.yaml
 playbooks/undercloud-tokenflush.yaml

This patch also fixes every molecule tests accordingly.

NB: check_network_gateway molecule test is now voting in the CI.

Closes-Bug: 1907553

Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
Change-Id: Iafc38c6cd99edee89ae0305f09fe7080df148331
(cherry picked from commit bc31f762c2)
changes/79/767679/3
Gael Chamoulaud (Strider) 2 years ago
parent 1a93c3c909
commit f4ea045e42
No known key found for this signature in database
GPG Key ID: 4119D0305C651D66
  1. 1
      .zuul.yaml
  2. 13
      roles/ceilometerdb_size/tasks/main.yml
  3. 7
      roles/check_network_gateway/molecule/default/converge.yml
  4. 36
      roles/check_network_gateway/molecule/default/prepare.yml
  5. 17
      roles/check_network_gateway/tasks/main.yml
  6. 13
      roles/container_status/tasks/main.yaml
  7. 34
      roles/ctlplane_ip_range/molecule/default/converge.yml
  8. 28
      roles/ctlplane_ip_range/molecule/default/prepare.yml
  9. 15
      roles/ctlplane_ip_range/tasks/main.yml
  10. 11
      roles/dhcp_validations/tasks/dhcp-provisioning.yaml
  11. 13
      roles/neutron_sanity_check/tasks/main.yml
  12. 15
      roles/tls_everywhere/tasks/pre-deployment.yaml
  13. 18
      roles/tls_everywhere/tasks/prep.yaml
  14. 3
      roles/undercloud_heat_purge_deleted/molecule/default/converge.yml
  15. 35
      roles/undercloud_heat_purge_deleted/molecule/default/prepare.yml
  16. 12
      roles/undercloud_heat_purge_deleted/tasks/main.yml
  17. 13
      roles/undercloud_process_count/tasks/main.yml
  18. 3
      roles/undercloud_tokenflush/molecule/default/converge.yml
  19. 18
      roles/undercloud_tokenflush/molecule/default/prepare.yml
  20. 13
      roles/undercloud_tokenflush/tasks/main.yml

@ -312,7 +312,6 @@
parent: tripleo-validations-centos-8-base
vars:
tripleo_validations_role_name: check_network_gateway
voting: false
- job:
files:
- ^roles/undercloud_heat_purge_deleted/.*

@ -5,14 +5,17 @@
Panko has been deprecated since the Train Release.
The 'ceilometerdb-size' validation is now considered as deprecated too.
- name: Get the path of tripleo undercloud config file
become: true
hiera:
name: "tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Check if telemetry services are enabled
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: enable_telemetry
register: enable_telemetry

@ -18,7 +18,6 @@
- name: Converge
hosts: all
gather_facts: false
tasks:
- name: successful check with ctlplane-subnet
include_role:
@ -26,12 +25,12 @@
- name: override undercloud.conf
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[DEFAULT]
local_subnet = 192.168.254.0/24
[192.168.254.0/24]
gateway = 8.8.8.8
gateway = 0.0.0.0
- name: successful check with local_ip
include_role:
@ -41,7 +40,7 @@
block:
- name: override undercloud.conf
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[ctlplane-subnet]
gateway = 192.168.254.254

@ -20,35 +20,17 @@
gather_facts: false
tasks:
- name: install hiera
package:
name: hiera
- name: create hiera tree
file:
path: /etc/puppet
state: directory
- name: populate hiera.yaml
copy:
dest: /etc/puppet/hiera.yaml
content: |
:backends:
- yaml
:yaml:
:datadir: "/etc/puppet/"
:hierarchy:
- "common"
- name: populate hiera content
copy:
dest: /etc/puppet/common.yaml
content: |
tripleo_undercloud_conf_file: /undercloud.conf
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: populate undercloud.conf
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[ctlplane-subnet]
gateway = 8.8.8.8
gateway = 0.0.0.0

@ -1,13 +1,16 @@
---
- name: Get the path of tripleo undercloud config file
become: true
hiera:
name: "tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Get the local_subnet name from the undercloud_conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: local_subnet
ignore_missing_file: true
@ -16,7 +19,7 @@
- name: Get gateway value from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: "{% if local_subnet.value %}{{ local_subnet.value }}{% else %}ctlplane-subnet{% endif %}"
key: gateway
ignore_missing_file: true
@ -25,7 +28,7 @@
- name: Get local_ip value from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: local_ip
ignore_missing_file: true

@ -10,14 +10,17 @@
block:
- name: Set container_cli fact from undercloud.conf
block:
- name: Get the path of tripleo undercloud config file
become: true
hiera:
name: "tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Get container client from undercloud.conf
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: container_cli
ignore_missing_file: true

@ -18,36 +18,20 @@
- name: Converge
hosts: all
gather_facts: false
tasks:
- name: prepare directory tree for hiera
file:
path: /etc/puppet
state: directory
- name: populate a hiera config
copy:
dest: /etc/puppet/hiera.yaml
content: |
:backends:
- yaml
- json
:yaml:
:datadir: "/etc/puppet/"
:hierarchy:
- "common"
- name: populate hiera content
copy:
dest: /etc/puppet/common.yaml
content: |
tripleo_undercloud_conf_file: /undercloud.conf
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Test good values
block:
- name: populate undercloud.conf with right range length
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[ctlplane-subnet]
dhcp_start = 192.168.12.10
@ -59,7 +43,7 @@
block:
- name: populate undercloud.conf with wrong range length
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[ctlplane-subnet]
dhcp_start = 192.168.12.10

@ -24,31 +24,3 @@
package:
name: python*-netaddr
state: installed
- name: install hiera
package:
name: hiera
state: installed
- name: prepare directory tree for hiera
file:
path: /etc/puppet
state: directory
- name: populate a hiera config
copy:
dest: /etc/puppet/hiera.yaml
content: |
:backends:
- yaml
- json
:yaml:
:datadir: "/etc/puppet/"
:hierarchy:
- "common"
- name: populate hiera content
copy:
dest: /etc/puppet/common.yaml
content: |
tripleo_undercloud_conf_file: /undercloud.conf

@ -1,13 +1,16 @@
---
- name: Get the path of tripleo undercloud config file
become: true
hiera:
name: "tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Get dhcp_start value from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: ctlplane-subnet
key: dhcp_start
ignore_missing_file: true
@ -17,7 +20,7 @@
- name: Get dhcp_end value from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: ctlplane-subnet
key: dhcp_end
ignore_missing_file: true

@ -1,10 +1,15 @@
---
- name: Get the path of tripleo undercloud config file
hiera: name="tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Gather undercloud.conf values
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: local_interface
ignore_missing_file: true

@ -7,15 +7,18 @@
- when: "'Undercloud' in group_names"
block:
- name: Get the path of tripleo undercloud config file
become: true
hiera:
name: "tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Get the Container CLI from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: container_cli
ignore_missing_file: true

@ -1,17 +1,20 @@
---
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Set facts for undercloud handlers to clean up
set_fact:
novajoin_temp_krb_caches: []
- name: Get the path of tripleo undercloud config file
become: true
hiera: name="tripleo_undercloud_conf_file"
check_mode: false
- name: Get the Container CLI from the undercloud.conf file (stein+)
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: container_cli
register: container_cli

@ -1,14 +1,16 @@
---
- name: Get the path of tripleo undercloud config file
become: true
hiera:
name: "tripleo_undercloud_conf_file"
check_mode: false
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Verify that nameservers are set in undercloud.conf
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: undercloud_nameservers
ignore_missing_file: false
@ -57,7 +59,7 @@
- name: Get domain as set in undercloud.conf
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: overcloud_domain_name
ignore_missing_file: false
@ -93,7 +95,7 @@
- name: Get enable_novajoin flag from undercloud.conf
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: enable_novajoin
ignore_missing_file: false

@ -18,7 +18,6 @@
- name: Converge
hosts: all
gather_facts: false
tasks:
- name: working detection
include_role:
@ -28,7 +27,7 @@
block:
- name: Override container_cli
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[DEFAULT]
container_cli = docker

@ -18,37 +18,18 @@
- name: Prepare
hosts: all
gather_facts: false
tasks:
- name: install hiera
package:
name: hiera
- name: create hiera tree
file:
path: /etc/puppet
state: directory
- name: populate hiera.yaml
copy:
dest: /etc/puppet/hiera.yaml
content: |
:backends:
- yaml
:yaml:
:datadir: "/etc/puppet/"
:hierarchy:
- "common"
- name: populate hiera content
copy:
dest: /etc/puppet/common.yaml
content: |
tripleo_undercloud_conf_file: /undercloud.conf
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: populate undercloud.conf
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[DEFAULT]
container_cli = podman

@ -1,12 +1,16 @@
---
- name: Get the path of tripleo undercloud config file
become: true
hiera: name="tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Get the Container CLI from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: container_cli
ignore_missing_file: true

@ -1,13 +1,16 @@
---
- name: Get the path of tripleo undercloud config file
become: true
hiera:
name: "tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Get the Container CLI from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: container_cli
ignore_missing_file: true

@ -18,7 +18,6 @@
- name: Converge
hosts: all
gather_facts: false
tasks:
- name: working detection
include_role:
@ -28,7 +27,7 @@
block:
- name: Override container_cli
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[DEFAULT]
container_cli = docker

@ -18,8 +18,15 @@
- name: Prepare
hosts: all
gather_facts: false
tasks:
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: install hiera
package:
name: hiera
@ -38,15 +45,8 @@
:yaml:
:datadir: "/etc/puppet/"
:hierarchy:
- "common"
- "service_configs"
- name: populate hiera content
copy:
dest: /etc/puppet/common.yaml
content: |
tripleo_undercloud_conf_file: /undercloud.conf
- name: populate service config content
copy:
dest: /etc/puppet/service_configs.yaml
@ -55,7 +55,7 @@
- name: populate undercloud.conf
copy:
dest: /undercloud.conf
dest: "{{ ansible_env.HOME }}/undercloud.conf"
content: |
[DEFAULT]
container_cli = podman

@ -9,15 +9,18 @@
- ansible_facts['keystone::token_provider'] != 'fernet'
- ansible_facts['keystone::token_provider'] != 'jws'
block:
- name: Get the path of tripleo undercloud config file
become: true
hiera: name="tripleo_undercloud_conf_file"
- name: Ensure we get needed facts
setup:
gather_subset:
- '!all'
- '!any'
- '!min'
- env
- name: Get the Container CLI from the undercloud.conf file
become: true
validations_read_ini:
path: "{{ tripleo_undercloud_conf_file }}"
path: "{{ ansible_env.HOME }}/undercloud.conf"
section: DEFAULT
key: container_cli
ignore_missing_file: true

Loading…
Cancel
Save