Browse Source

Merge "Parametrize UpgradeLeappDevelSkip to pass multiple env variables." into stable/stein

tags/10.6.1
Zuul 3 weeks ago
parent
commit
1239e5a68c

+ 8
- 6
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml View File

@@ -59,10 +59,12 @@ parameters:
59 59
     description: Print debugging output when running Leapp
60 60
     type: boolean
61 61
     default: true
62
-  UpgradeLeappDevelSkipRhsm:
63
-    description: Skip RHSM when running Leapp in development/testing.
64
-    type: boolean
65
-    default: false
62
+  UpgradeLeappDevelSkip:
63
+    description: |
64
+      Skip Leapp checks by setting env variables when running Leapp in
65
+      development/testing. For example, LEAPP_DEVEL_SKIP_RHSM=1.
66
+    type: string
67
+    default: ''
66 68
   UpgradeLeappRebootTimeout:
67 69
     description: Timeout (seconds) for the OS upgrade phase via Leapp
68 70
     type: number
@@ -97,7 +99,7 @@ outputs:
97 99
           set_fact:
98 100
             upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
99 101
             upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
100
-            upgrade_leapp_devel_skip_rhsm: {get_param: UpgradeLeappDevelSkipRhsm}
102
+            upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
101 103
             upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
102 104
 
103 105
         - name: system_upgrade_prepare step 3
@@ -133,7 +135,7 @@ outputs:
133 135
           block:
134 136
             - name: run leapp upgrade (download packages)
135 137
               shell: >
136
-                {% if upgrade_leapp_devel_skip_rhsm|default(false) %}LEAPP_DEVEL_SKIP_RHSM=1{% endif %}
138
+                {% if upgrade_leapp_devel_skip|default(false) %}{{ upgrade_leapp_devel_skip }}{% endif %}
137 139
                 leapp upgrade
138 140
                 {% if upgrade_leapp_debug|default(true) %}--debug{% endif %}
139 141
               when: upgrade_leapp_enabled

Loading…
Cancel
Save