From 6fc945c61c4630c233abaa34229cd5b4c8c70361 Mon Sep 17 00:00:00 2001
From: Nakul Pathak <napathak@redhat.com>
Date: Tue, 5 May 2026 16:07:24 +0530
Subject: [PATCH] Rename --foreman-initial-* options to --initial-* in
 foremanctl

---
 .github/workflows/test.yml               | 4 ++--
 DEVELOPMENT.md                           | 2 +-
 docs/user/parameters.md                  | 4 ++--
 src/playbooks/deploy/metadata.obsah.yaml | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 10c21d23c..1feee1988 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -122,7 +122,7 @@ jobs:
           ./foremanctl pull-images
       - name: Run deployment
         run: |
-          ./foremanctl deploy --certificate-source=${{ matrix.certificate_source }} ${{ matrix.database == 'external' && '--database-mode=external --database-host=database.example.com --database-ssl-ca $(pwd)/.var/lib/foremanctl/db-ca.crt --database-ssl-mode verify-full' || '' }} ${{ matrix.certificate_source == 'custom_server' && '--certificate-server-certificate /root/custom-certificates/certs/quadlet.example.com.crt --certificate-server-key /root/custom-certificates/private/quadlet.example.com.key --certificate-server-ca-certificate /root/custom-certificates/certs/server-ca.crt' || '' }} --foreman-initial-admin-password=changeme --initial-organization "Foreman CI" --initial-location "Internet" --tuning development
+          ./foremanctl deploy --certificate-source=${{ matrix.certificate_source }} ${{ matrix.database == 'external' && '--database-mode=external --database-host=database.example.com --database-ssl-ca $(pwd)/.var/lib/foremanctl/db-ca.crt --database-ssl-mode verify-full' || '' }} ${{ matrix.certificate_source == 'custom_server' && '--certificate-server-certificate /root/custom-certificates/certs/quadlet.example.com.crt --certificate-server-key /root/custom-certificates/private/quadlet.example.com.key --certificate-server-ca-certificate /root/custom-certificates/certs/server-ca.crt' || '' }} --initial-admin-password=changeme --initial-organization "Foreman CI" --initial-location "Internet" --tuning development
       - name: Add optional feature - hammer
         run: |
           ./foremanctl deploy --add-feature hammer
@@ -235,7 +235,7 @@ jobs:
           ./foremanctl pull-images
       - name: Run deployment
         run: |
-          ./foremanctl deploy --foreman-initial-admin-password=changeme --initial-organization "Foreman CI" --initial-location "Internet" --tuning development
+          ./foremanctl deploy --initial-admin-password=changeme --initial-organization "Foreman CI" --initial-location "Internet" --tuning development
       - name: Add optional feature - hammer
         run: |
           ./foremanctl deploy --add-feature hammer
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index f83bdbb8e..11507b07f 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -36,7 +36,7 @@ This setup uses Vagrant to create a basic VM for running the deployment on:
 ./setup-environment
 source .venv/bin/activate
 ./forge vms start
-./foremanctl deploy --foreman-initial-admin-password=changeme --tuning development --initial-organization "Foreman CI" --initial-location "Internet"
+./foremanctl deploy --initial-admin-password=changeme --tuning development --initial-organization "Foreman CI" --initial-location "Internet"
 ```
 
 ### Deploy hammer (optional)
diff --git a/docs/user/parameters.md b/docs/user/parameters.md
index 4b35b713c..85d9c6619 100644
--- a/docs/user/parameters.md
+++ b/docs/user/parameters.md
@@ -47,8 +47,8 @@ There are multiple use cases from the users perspective that dictate what parame
 | `--pulp-database-name` | Name of the Pulp database | `--foreman-proxy-content-pulpcore-postgresql-db-name` |
 | `--pulp-database-user` | Owner of the Pulp database | `--foreman-proxy-content-pulpcore-postgresql-user` |
 | `--pulp-database-password` | Password for Pulp database | `--foreman-proxy-content-pulpcore-postgresql-password` |
-| `--foreman-initial-admin-username` | Initial username for the admin user | `--foreman-initial-admin-username` |
-| `--foreman-initial-admin-password` | Initial password for the admin user | `--foreman-initial-admin-password` |
+| `--initial-admin-username` | Initial username for the admin user | `--foreman-initial-admin-username` |
+| `--initial-admin-password` | Initial password for the admin user | `--foreman-initial-admin-password` |
 | `--initial-organization` | Name of an initial organization | `--foreman-initial-organization` |
 | `--initial-location` | Name of an initial location | `--foreman-initial-location` |
 | `--foreman-puma-workers` | Number of workers for Puma | `--foreman-foreman-service-puma-workers` |
diff --git a/src/playbooks/deploy/metadata.obsah.yaml b/src/playbooks/deploy/metadata.obsah.yaml
index 0f75a7922..e572ff46d 100644
--- a/src/playbooks/deploy/metadata.obsah.yaml
+++ b/src/playbooks/deploy/metadata.obsah.yaml
@@ -5,8 +5,10 @@ help: |
 variables:
   foreman_initial_admin_username:
     help: Initial username for the admin user.
+    parameter: --initial-admin-username
   foreman_initial_admin_password:
     help: Initial password for the admin user.
+    parameter: --initial-admin-password
   foreman_initial_organization:
     help: Name of an initial organization.
     parameter: --initial-organization