openstack
/
tripleo-quickstart
Code Issues Proposed changes

Change supp user per ansible_distribution_major_version 

When running on CentOS Stream 9 distribution, the supplemental
user should be 'cloud-user', instead of 'centos'

Closes-Bug: #1956563
Change-Id: Id90c0bcc2f15a742b83b834acc75231ca4d44a83
This commit is contained in:
Ronelle Landy 2022-01-13 15:03:37 -05:00 committed by Douglas Viroel
parent 945c08a0c1
commit cf48a79c8f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/general_config/featureset039.yml
View File

@ -244,7 +244,12 @@ overcloud_cloud_name_ctlplane: "overcloud.ctlplane.{{ tripleo_domain }}"
# Supplemental node related vars. #
# Ensure that the FreeIPA server node is provisioned during deployment.
deploy_supplemental_node: true
supplemental_user: centos
supplemental_user: >-
{% if (ansible_distribution == "CentOS") and (ansible_distribution_major_version|int >= 9) -%}
cloud-user
{%- else -%}
centos
{%- endif -%}
supplemental_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"

7
config/general_config/featureset064.yml
View File

@ -160,7 +160,12 @@ overcloud_cloud_domain: "{{ tripleo_domain }}"
# Supplemental node related vars. #
# Ensure that the FreeIPA server node is provisioned during deployment.
deploy_supplemental_node: true
supplemental_user: centos
supplemental_user: >-
{% if (ansible_distribution == "CentOS") and (ansible_distribution_major_version|int >= 9) -%}
cloud-user
{%- else -%}
centos
{%- endif -%}
supplemental_image_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20201217.0.x86_64.qcow2
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"