use pull_secret

karmab · Sep 26, 2024 · 72e14fd · 72e14fd
1 parent d6bc762
commit 72e14fd
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/lab.yml b/.github/workflows/lab.yml
@@ -21,16 +21,16 @@ on:
       EXTRAPARAMS:
         description: 'Extra params'
         default: ''
-      PULLSECRET:
-        description: 'pullsecret'
+      PULL_SECRET:
+        description: 'pull_secret'
         required: false
         default: /root/openshift_pull.json
       LAUNCH_STEPS:
         description: 'launch_steps'
         required: false
         default: True
-      DEPLOY_OPENSHIFT:
-        description: 'deploy_openshift'
+      DEPLOY_HUB:
+        description: 'deploy_hub'
         required: false
         default: True
       VERSION:
@@ -50,9 +50,9 @@ env:
  INPUTFILE: ${{github.event.inputs.INPUTFILE}}
  PARAMFILE: ${{github.event.inputs.PARAMFILE}}
  EXTRAPARAMS: ${{github.event.inputs.EXTRAPARAMS}}
- PULLSECRET: ${{github.event.inputs.PULLSECRET}}
+ PULL_SECRET: ${{github.event.inputs.PULL_SECRET}}
  LAUNCH_STEPS: ${{github.event.inputs.LAUNCH_STEPS}}
- DEPLOY_OPENSHIFT: ${{github.event.inputs.DEPLOY_OPENSHIFT}}
+ DEPLOY_HUB: ${{github.event.inputs.DEPLOY_HUB}}
  VERSION: ${{github.event.inputs.VERSION}}
  TAG: ${{github.event.inputs.TAG}}
 
@@ -74,4 +74,4 @@ jobs:
       runs-on: ${{github.event.inputs.RUNNER}}
       steps:
        - name: Deploy kcli plan
-         run: kcli -C $CLIENT create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pullsecret=$PULLSECRET -P launch_steps=$LAUNCH_STEPS -P deploy_openshift=$DEPLOY_OPENSHIFT -P version=$VERSION -P tag=$TAG $EXTRAPARAMS $PLAN
+         run: kcli -C $CLIENT create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pull_secret=$PULL_SECRET -P launch_steps=$LAUNCH_STEPS -P deploy_hub=$DEPLOY_HUB -P version=$VERSION -P tag=$TAG $EXTRAPARAMS $PLAN
diff --git a/.github/workflows/lab_ipv6.yml b/.github/workflows/lab_ipv6.yml
@@ -21,16 +21,16 @@ on:
       EXTRAPARAMS:
         description: 'Extra params'
         default: ''
-      PULLSECRET:
-        description: 'pullsecret'
+      PULL_SECRET:
+        description: 'pull_secret'
         required: false
         default: /root/openshift_pull.json
       LAUNCH_STEPS:
         description: 'launch_steps'
         required: false
         default: True
-      DEPLOY_OPENSHIFT:
-        description: 'deploy_openshift'
+      DEPLOY_HUB:
+        description: 'deploy_hub'
         required: false
         default: True
       VERSION:
@@ -50,9 +50,9 @@ env:
  INPUTFILE: ${{github.event.inputs.INPUTFILE}}
  PARAMFILE: ${{github.event.inputs.PARAMFILE}}
  EXTRAPARAMS: ${{github.event.inputs.EXTRAPARAMS}}
- PULLSECRET: ${{github.event.inputs.PULLSECRET}}
+ PULL_SECRET: ${{github.event.inputs.PULL_SECRET}}
  LAUNCH_STEPS: ${{github.event.inputs.LAUNCH_STEPS}}
- DEPLOY_OPENSHIFT: ${{github.event.inputs.DEPLOY_OPENSHIFT}}
+ DEPLOY_HUB: ${{github.event.inputs.DEPLOY_HUB}}
  VERSION: ${{github.event.inputs.VERSION}}
  TAG: ${{github.event.inputs.TAG}}
 
@@ -74,4 +74,4 @@ jobs:
       runs-on: ${{github.event.inputs.RUNNER}}
       steps:
        - name: Deploy kcli plan
-         run: kcli -C $CLIENT create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pullsecret=$PULLSECRET -P launch_steps=$LAUNCH_STEPS -P deploy_openshift=$DEPLOY_OPENSHIFT -P version=$VERSION -P tag=$TAG $EXTRAPARAMS $PLAN
+         run: kcli -C $CLIENT create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pull_secret=$PULL_SECRET -P launch_steps=$LAUNCH_STEPS -P deploy_hub=$DEPLOY_HUB -P version=$VERSION -P tag=$TAG $EXTRAPARAMS $PLAN
diff --git a/.github/workflows/lab_nightly.yml b/.github/workflows/lab_nightly.yml
@@ -9,7 +9,7 @@ env:
  PLAN: lab
  INPUTFILE: plans/kcli_plan.yml
  PARAMFILE: paramfiles/lab_ipv6.yml
- PULLSECRET: /root/openshift_pull.json
+ PULL_SECRET: /root/openshift_pull.json
 
 jobs:
     requirements:
@@ -28,7 +28,7 @@ jobs:
       runs-on: libvirt
       steps:
       - name: Deploy kcli plan
-        run: kcli -c local create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pullsecret=$PULLSECRET $PLAN
+        run: kcli -c local create plan --force -f $INPUTFILE --paramfile $PARAMFILE -P pull_secret=$PULL_SECRET $PLAN
       #- name: Clean up
       #  if: always()
       #  run: kcli -c local delete plan --yes $PLAN
diff --git a/README.md b/README.md
@@ -162,7 +162,7 @@ Note that you can use the baseplan `kcli_plan_infra.yml` to deploy the infrastru
 |numcpus                                      |16                           |
 |openshift_image                              |None                         |
 |prs                                          |[]                           |
-|pullsecret                                   |openshift_pull.json          |
+|pull_secret                                  |openshift_pull.json          |
 |registry_image                               |quay.io/karmab/registry:amd64|
 |rhnregister                                  |True                         |
 |rhnwait                                      |30                           |

diff --git a/plans/kcli_plan.yml b/plans/kcli_plan.yml
@@ -96,7 +96,7 @@
    origin: mirror-registry/quay_haproxy.service
  - mirror-registry/quay_haproxy.cfg
 {% endif %}
- - origin: {{ pullsecret }}
+ - origin: {{ pull_secret }}
    path: /root/openshift_pull.json
  - path: /etc/systemd/system/registry.service
    origin: bin/registry.service

diff --git a/plans/kcli_plan_default.yml b/plans/kcli_plan_default.yml
@@ -3,7 +3,7 @@ info: |
     - stop the nodes to deploy through redfish
     - launch the install against a set of baremetal nodes (and optionally virtual ctlplanes)
     It can be used with a centos stream or rhel vm (which required to set rhn credentials in your kcli config)
-    default location for pull secret is openshift_pull.json unless overriding with pullsecret variable
+    default location for pull secret is openshift_pull.json unless overriding with pull_secret variable
     api_ip and ingress_ip need to be set along with ctlplanes and workers array to specify your nodes.
     Nfs can be set to true to deploy nfs provisioner using a share on the installer vm
     default network type is OVNKubernetes but you can also specify OpenShiftSDN
@@ -42,7 +42,7 @@ bmc_reset: false
 baremetal_cidr:
 baremetal_macs: []
 baremetal_ips: []
-pullsecret: openshift_pull.json
+pull_secret: openshift_pull.json
 notifyscript: scripts/notify.sh
 notify: false
 launch_steps: true