Re: [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings

[Jeff Layton <jlayton@kernel.org>]

On Fri, 2023-12-08 at 10:01 -0500, Jeff Layton wrote:
> Just excise "vagrant" part from them. We might want to use the same
> setting for terraform someday in any case.
> 
> signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  playbooks/roles/devconfig/defaults/main.yml                  |  4 ++--
>  playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml |  8 ++++----
>  playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml     |  4 ++--
>  scripts/vagrant.Makefile                                     | 12 ++++++------
>  vagrant/Kconfig.fedora                                       | 10 +++++-----
>  5 files changed, 19 insertions(+), 19 deletions(-)
> 
> diff --git a/playbooks/roles/devconfig/defaults/main.yml b/playbooks/roles/devconfig/defaults/main.yml
> index 3eb1af8caee6..42a21a2aca92 100644
> --- a/playbooks/roles/devconfig/defaults/main.yml
> +++ b/playbooks/roles/devconfig/defaults/main.yml
> @@ -41,5 +41,5 @@ devconfig_enable_sysctl_mm_overcommit_memory: False
>  devconfig_sysctl_conf: "/etc/sysctl.conf"
>  devconfig_sysctl_mm_overcommit_memory: 0
>  
> -vagrant_rhel_org_id: ""
> -vagrant_rhel_activation_key: ""
> +rhel_org_id: ""
> +rhel_activation_key: ""
> diff --git a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
> index 175bf27c61a3..8426826034e7 100644
> --- a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
> +++ b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
> @@ -5,12 +5,12 @@
>    become: yes
>    community.general.redhat_subscription:
>      state: present
> -    org_id: "{{ vagrant_rhel_org_id }}"
> -    activationkey: "{{ vagrant_rhel_activation_key }}"
> +    org_id: "{{ rhel_org_id }}"
> +    activationkey: "{{ rhel_activation_key }}"
>      force_register: true
>    when:
> -    - vagrant_rhel_org_id
> -    - vagrant_rhel_activation_key
> +    - rhel_org_id
> +    - rhel_activation_key
>  
>  - name: Check whether custom repofile exists
>    stat:
> diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
> index 7d532b23c6c9..9a133c0da661 100644
> --- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
> +++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
> @@ -3,8 +3,8 @@
>    become: yes
>    command: /usr/bin/dnf config-manager --enable codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rpms
>    when:
> -    - vagrant_rhel_org_id is defined
> -    - vagrant_rhel_activation_key is defined
> +    - rhel_org_id is defined
> +    - rhel_activation_key is defined
>  
>  - name: Install build dependencies for pynfs
>    become: yes
> diff --git a/scripts/vagrant.Makefile b/scripts/vagrant.Makefile
> index 48d990321190..a6a74f8755e7 100644
> --- a/scripts/vagrant.Makefile
> +++ b/scripts/vagrant.Makefile
> @@ -56,12 +56,12 @@ ifeq (y,$(CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH))
>  LIBVIRT_PCIE_PASSTHROUGH := libvirt_pcie_passthrough_permissions
>  endif
>  
> -ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ORG_ID)),)
> -ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ACTIVATION_KEY)),)
> -RHEL_ORG_ID:=$(subst ",,$(CONFIG_VAGRANT_RHEL_ORG_ID))
> -RHEL_ACTIVATION_KEY:=$(subst ",,$(CONFIG_VAGRANT_RHEL_ACTIVATION_KEY))
> -VAGRANT_ARGS += vagrant_rhel_org_id="$(RHEL_ORG_ID)"
> -VAGRANT_ARGS += vagrant_rhel_activation_key="$(RHEL_ACTIVATION_KEY)"
> +ifneq ($(strip $(CONFIG_RHEL_ORG_ID_ORG_ID)),)

I think my search and replace went awry here. I've fixed up the names in
tree and can re-post if people want. This patch obviously needs more
testing, but my usual test rig for RHEL guests is down at the moment.

> +ifneq ($(strip $(CONFIG_RHEL_ORG_ID_ACTIVATION_KEY)),)
> +RHEL_ORG_ID:=$(subst ",,$(CONFIG_RHEL_ORG_ID_ORG_ID))
> +RHEL_ACTIVATION_KEY:=$(subst ",,$(CONFIG_RHEL_ORG_ID_ACTIVATION_KEY))
> +VAGRANT_ARGS += rhel_org_id="$(RHEL_ORG_ID)"
> +VAGRANT_ARGS += rhel_activation_key="$(RHEL_ACTIVATION_KEY)"
>  endif
>  endif
>  
> diff --git a/vagrant/Kconfig.fedora b/vagrant/Kconfig.fedora
> index cd5fa5059246..aee5c17f2b3c 100644
> --- a/vagrant/Kconfig.fedora
> +++ b/vagrant/Kconfig.fedora
> @@ -17,7 +17,7 @@ config VAGRANT_FEDORA_OLD_RELEASE
>  	  features. Enabling this will disable testing certain
>  	  configurations by default in the fstests workflow.
>  
> -config VAGRANT_RHEL_REGISTER
> +config RHEL_ORG_ID_REGISTER
>  	bool "Register the guests with Red Hat?"
>  	default n
>  	help
> @@ -25,16 +25,16 @@ config VAGRANT_RHEL_REGISTER
>  	  packages from their core repos. Enable this if you're deploying an official
>  	  RHEL cloud image (e.g. generic/rhel9).
>  
> -config VAGRANT_RHEL_ORG_ID
> +config RHEL_ORG_ID_ORG_ID
>  	string "Red Hat Organization Identifier"
> -	depends on VAGRANT_RHEL_REGISTER
> +	depends on RHEL_ORG_ID_REGISTER
>  	default ""
>  	help
>  	  Enter the Red Hat Organizational ID for your subscription here.
>  
> -config VAGRANT_RHEL_ACTIVATION_KEY
> +config RHEL_ORG_ID_ACTIVATION_KEY
>  	string "Red Hat Activation Key"
> -	depends on VAGRANT_RHEL_REGISTER
> +	depends on RHEL_ORG_ID_REGISTER
>  	default ""
>  	help
>  	  Enter the Activation Key to use when registering systems.
> 

-- 
Jeff Layton <jlayton@kernel.org>