From 226d5cb2a60b27fddb0995fa89ac1e2a0f1db5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Tue, 28 Jun 2022 10:14:23 +0200
Subject: [PATCH] Comment out the empty "parameter_defaults"

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
---
 environments/rhsm.yaml | 44 ++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/environments/rhsm.yaml b/environments/rhsm.yaml
index 8809621f3d..6f94bbc677 100644
--- a/environments/rhsm.yaml
+++ b/environments/rhsm.yaml
@@ -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
 #