Merge "Add new rhsm_overcloud_env parameter to tripleo-upgrade."

defaults/main.yml

@@ -256,3 +256,6 @@ stein_registry_params:
   namespace_stein: "{{ full_namespace }}"
   tag_stein: "20200115.1"
   name_prefix_stein: "rhosp15-openstack-"
+
+# rhsm overcloud environment location with subscription details
+rhsm_overcloud_env: ''

infrared_plugin/main.yml

@@ -204,6 +204,10 @@
             nova_actions_check: true
           when: install.upgrade.nova.actions.check
 
+        - name: Set rhsm_overcloud_env
+          set_fact:
+            rhsm_overcloud_env: "{{ install.rhsm.overcloud.env }}"
+
       tags:
         - always
   roles:

infrared_plugin/plugin.spec

@@ -208,6 +208,10 @@ subparsers:
                               ---
                               resource_registry:
                                   OS::TripleO::BlockStorage::Net::SoftwareConfig: /home/stack/nic-configs/cinder-storage.yaml
+                  rhsm-overcloud-env:
+                      type: Value
+                      help: Rhsm environment location to be passed during upgrade/update prepare step ssh user name name
+                      default: ''
 
 
             - title: TripleO Fast Forward Upgrade

templates/overcloud_update_prepare.sh.j2

@@ -36,6 +36,11 @@ openstack overcloud update prepare --templates {{ tht_directory }} \
     {% if config_heat_extra_yaml is defined -%}
     -e {{ working_dir }}/{{ install.deployment.files | basename }}/config_heat_extra.yaml \
     {% endif -%}
+    {% if rhsm_overcloud_env != '' -%}
+    # adding rhsm at the end so it overrides any other rhsm params passed.
+    -e /usr/share/openstack-tripleo-heat-templates/environments/rhsm.yaml \
+    -e {{ rhsm_overcloud_env }} \
+    {% endif -%}
     {% if roles_data != default_roles_data -%}
     --roles-file {{ roles_data }} \
     {% endif -%}

templates/overcloud_upgrade_prepare.sh.j2

@@ -53,4 +53,9 @@ openstack overcloud upgrade prepare --stack {{ overcloud_stack_name }} \
     -e {{ upgrade_prepare_extra_params | join(' -e ') }} \
     {% endif -%}
     -e {{ working_dir }}/{{ uc_containers_prepare_file }} \
+    {% if rhsm_overcloud_env != '' -%}
+    # adding rhsm at the end so it overrides any other rhsm params passed.
+    -e {{ tht_directory }}/environments/rhsm.yaml \
+    -e {{ rhsm_overcloud_env }} \
+    {% endif -%}
     {% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1