From 935261deae906d0c0b15f77dca8aa78380f91b18 Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <dvd@redhat.com>
Date: Thu, 3 Mar 2022 11:31:39 -0500
Subject: [PATCH] Disabling container validation when running
 redhat-subscription

subscription-manager will fail if run from within a container. Since
some nodes are bindmounting /run, a .containerenv file is exposed
inside /run on the hosts and this breaks subscription-manager on
overcloud nodes.

We can bypass this validation from subscription-manager by enabling the
SMDEV_CONTAINER_OFF environment boolean as described here [1].

Related: https://bugzilla.redhat.com/show_bug.cgi?id=2058540
[1] https://github.com/candlepin/subscription-manager/pull/2652/files

Co-authored-by: Bogdan Dobrelia <bdobreli@redhat.com>
Depends-On: https://review.opendev.org/c/openstack/ansible-role-redhat-subscription/+/831810
Change-Id: Id23af246cc91fa830c30985437791533e8bd354c
(cherry picked from commit 53d3af77f717ffbe52d629f83e6381d351f113e6)
---
 deployment/rhsm/rhsm-baremetal-ansible.yaml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/deployment/rhsm/rhsm-baremetal-ansible.yaml b/deployment/rhsm/rhsm-baremetal-ansible.yaml
index d5202805c3..8a635be6f5 100644
--- a/deployment/rhsm/rhsm-baremetal-ansible.yaml
+++ b/deployment/rhsm/rhsm-baremetal-ansible.yaml
@@ -47,12 +47,12 @@ resources:
     properties:
       type: json
       value:
-        map_replace:
-          - map_replace:
-            - vars: RhsmVars
-            - values: {get_param: [RoleParameters]}
-          - values:
-              RhsmVars: {get_param: RhsmVars}
+        map_merge:
+          - rhsm_disable_container_check: true
+          - if:
+              - not: {equals: [{get_param: [RoleParameters, RhsmVars]}, '']}
+              - {get_param: [RoleParameters, RhsmVars]}
+              - {get_param: RhsmVars}
 
 outputs:
   role_data:
@@ -63,7 +63,7 @@ outputs:
         - name: Red Hat Subscription Management configuration during deployment
           import_role:
             name: redhat-subscription
-          vars: {get_attr: [RoleParametersValue, value, vars]}
+          vars: {get_attr: [RoleParametersValue, value]}
       scale_tasks:
         - name: Red Hat Subscription Management configuration during scale-down
           tags: down
@@ -71,13 +71,14 @@ outputs:
           import_role:
             name: redhat-subscription
             tasks_from: unregister
+          vars: {get_attr: [RoleParametersValue, value]}
       upgrade_tasks:
         - name: Red Hat Subscription Management configuration
           import_role:
             name: redhat-subscription
           vars:
             map_merge:
-              - {get_attr: [RoleParametersValue, value, vars]}
+              - {get_attr: [RoleParametersValue, value]}
               # Force only rhsm_repos content to be enabled.
               - rhsm_repos_purge: True
               - rhsm_force_register: True