openstack/tripleo-heat-templates
Code Issues Proposed changes

Comment out the empty "parameter_defaults"

Browse Source 
If an operator passes this file and gets their actual RHSM data in
another environment file, such as:
openstack overcloud deploy \
  -e /usr/share/openstack-tripleo-heat-templates/environments/rhsm.yaml \
  -e /home/stack/custom-rhsm.yaml

it will fail with the following error:
ValueError: environment has empty section "parameter_defaults"

Commenting out the empty parameter_defaults will avoid this kind of
issue - while allowing the operator to still pass their files.

Change-Id: I4d0fef3fe2f821ad694858b0bf109b555f736823
This commit is contained in:
Cédric Jeanneret 2022-06-28 10:14:23 +02:00
parent 5ee095f448
commit 226d5cb2a6
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
environments/rhsm.yaml
View File

@ -3,26 +3,8 @@
resource_registry:
OS::TripleO::Services::Rhsm: ../deployment/rhsm/rhsm-baremetal-ansible.yaml
parameter_defaults:
# RhsmVars:
# rhsm_repos:
# - rhel-8-for-x86_64-baseos-eus-rpms
# - rhel-8-for-x86_64-appstream-eus-rpms
# - rhel-8-for-x86_64-highavailability-eus-rpms
# - ansible-2.9-for-rhel-8-x86_64-rpms
# - advanced-virt-for-rhel-8-x86_64-rpms
# - openstack-16.1-for-rhel-8-x86_64-rpms
# - fast-datapath-for-rhel-8-x86_64-rpms
# - rhceph-4-tools-for-rhel-8-x86_64-rpms
# - rhceph-4-mon-for-rhel-8-x86_64-rpms
# rhsm_activation_key: 'secrete-key'
# rhsm_release: '8.2'
# In some cases, you want to configure specific repos on some roles.
# Each role can have its own RHSM configuration.
# Example:
# ComputeHCIParameters:
# Basic example usage
# parameter_defaults:
# RhsmVars:
# rhsm_repos:
# - rhel-8-for-x86_64-baseos-eus-rpms
@ -34,9 +16,29 @@ parameter_defaults:
# - fast-datapath-for-rhel-8-x86_64-rpms
# - rhceph-4-tools-for-rhel-8-x86_64-rpms
# - rhceph-4-mon-for-rhel-8-x86_64-rpms
# rhsm_activation_key: 'anothersecrete-key'
# rhsm_activation_key: 'secrete-key'
# rhsm_release: '8.2'
#
#
# In some cases, you want to configure specific repos on some roles.
# Each role can have its own RHSM configuration.
# Example:
# parameter_defaults:
# ComputeHCIParameters:
# RhsmVars:
# rhsm_repos:
# - rhel-8-for-x86_64-baseos-eus-rpms
# - rhel-8-for-x86_64-appstream-eus-rpms
# - rhel-8-for-x86_64-highavailability-eus-rpms
# - ansible-2.9-for-rhel-8-x86_64-rpms
# - advanced-virt-for-rhel-8-x86_64-rpms
# - openstack-16.1-for-rhel-8-x86_64-rpms
# - fast-datapath-for-rhel-8-x86_64-rpms
# - rhceph-4-tools-for-rhel-8-x86_64-rpms
# - rhceph-4-mon-for-rhel-8-x86_64-rpms
# rhsm_activation_key: 'anothersecrete-key'
# rhsm_release: '8.2'
#
# More about composable roles:
# https://docs.openstack.org/project-deploy-guide/tripleo-docs/latest/features/role_specific_parameters.html
#