Merge "Parametrize UpgradeLeappDevelSkip to pass multiple env variables."

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

@@ -59,10 +59,12 @@ parameters:
     description: Print debugging output when running Leapp
     type: boolean
     default: true
-  UpgradeLeappDevelSkipRhsm:
+  UpgradeLeappDevelSkip:
-    description: Skip RHSM when running Leapp in development/testing.
+    description: |
-    type: boolean
+      Skip Leapp checks by setting env variables when running Leapp in
-    default: false
+      development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1.
+    type: string
+    default: ''
   UpgradeLeappRebootTimeout:
     description: Timeout (seconds) for the OS upgrade phase via Leapp
     type: number
@@ -97,7 +99,7 @@ outputs:
           set_fact:
             upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
             upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
-            upgrade_leapp_devel_skip_rhsm: {get_param: UpgradeLeappDevelSkipRhsm}
+            upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
             upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
 
         - name: system_upgrade_prepare step 3
@@ -133,7 +135,7 @@ outputs:
           block:
             - name: run leapp upgrade (download packages)
               shell: >
-                {% if upgrade_leapp_devel_skip_rhsm|default(false) %}LEAPP_DEVEL_SKIP_RHSM=1{% endif %}
+                {% if upgrade_leapp_devel_skip|default(false) %}{{ upgrade_leapp_devel_skip }}{% endif %}
                 leapp upgrade
                 {% if upgrade_leapp_debug|default(true) %}--debug{% endif %}
               when: upgrade_leapp_enabled