From 3812121b5ad18570c362ed5ba2361660e19ec0fe Mon Sep 17 00:00:00 2001 From: Joniel Pasqualetto Date: Thu, 9 May 2024 13:54:51 -0400 Subject: [PATCH] Fixes #37433 - Set indentation when calling subscription_manager_setup and add snapshot of templates --- .../snippet/redhat_register.erb | 2 +- .../CloudInit_default.host4dhcp.snap.txt | 164 +++++++++--------- ...ickstart_default_finish.host4dhcp.snap.txt | 164 +++++++++--------- .../Kickstart_default.host4and6dhcp.snap.txt | 164 +++++++++--------- .../Kickstart_default.host4dhcp.snap.txt | 164 +++++++++--------- .../Kickstart_default.host4static.snap.txt | 164 +++++++++--------- .../Kickstart_default.host6dhcp.snap.txt | 164 +++++++++--------- .../Kickstart_default.host6static.snap.txt | 164 +++++++++--------- .../Kickstart_default.rocky8_dhcp.snap.txt | 164 +++++++++--------- .../Kickstart_default.rocky9_dhcp.snap.txt | 164 +++++++++--------- ...start_default_user_data.host4dhcp.snap.txt | 164 +++++++++--------- 11 files changed, 821 insertions(+), 821 deletions(-) diff --git a/app/views/unattended/provisioning_templates/snippet/redhat_register.erb b/app/views/unattended/provisioning_templates/snippet/redhat_register.erb index 08caa63436c..f0c6e555713 100644 --- a/app/views/unattended/provisioning_templates/snippet/redhat_register.erb +++ b/app/views/unattended/provisioning_templates/snippet/redhat_register.erb @@ -96,7 +96,7 @@ description: | echo "Starting the subscription-manager registration process" # Set up subscription-manager - <%= snippet("subscription_manager_setup", variables: { subman_setup_scenario: 'provisioning' }).strip -%> + <%= indent(2) { snippet("subscription_manager_setup", variables: { subman_setup_scenario: 'provisioning' }).strip } -%> <%- if (host_param('syspurpose_role') || host_param('syspurpose_usage') || host_param('syspurpose_sla') || host_param('syspurpose_addons')) -%> # Avoid timeout accessing unreachable repo on air gapped infrastructure, diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/cloud-init/CloudInit_default.host4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/cloud-init/CloudInit_default.host4dhcp.snap.txt index 19d0796a72b..70746207f8f 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/cloud-init/CloudInit_default.host4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/cloud-init/CloudInit_default.host4dhcp.snap.txt @@ -38,92 +38,92 @@ runcmd: echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) - if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi - fi - - # Define the path to rhsm.conf - RHSM_CFG=/etc/rhsm/rhsm.conf - - - - # Prepare subscription-manager - if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager - else - echo "subscription-manager is already installed!" - fi - - # Check if rhsm.conf exists - if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 - fi - - - # Configure subscription-manager - test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak - subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - - # Older versions of subscription manager may not recognize - # report_package_profile and package_profile_on_trans options. - # So set them separately and redirect out & error to /dev/null - # to fail silently. - subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true - subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - - # Configuration for EL6 - if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG - else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG - fi - - - # Restart yggdrasild if installed and running - systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Kickstart_default_finish.host4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Kickstart_default_finish.host4dhcp.snap.txt index 89e5d2fa38a..26f3310f0ed 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Kickstart_default_finish.host4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/finish/Kickstart_default_finish.host4dhcp.snap.txt @@ -23,92 +23,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt index 1b8ae75652b..fd903ae59d1 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt @@ -86,92 +86,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt index 3a77ebe2d28..8bf727bc0ef 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt @@ -86,92 +86,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt index a7a76b8f2e2..4ac57ece97a 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt @@ -86,92 +86,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt index faa259b4e0e..1f21fc30f34 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt @@ -86,92 +86,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt index b5f1e22d587..34a0fb14eaf 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt @@ -86,92 +86,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt index 5fd2fdb986e..f80086a36b1 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky8_dhcp.snap.txt @@ -84,92 +84,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt index 365c0d597c3..90c65a89d9d 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.rocky9_dhcp.snap.txt @@ -83,92 +83,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Kickstart_default_user_data.host4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Kickstart_default_user_data.host4dhcp.snap.txt index 59f110785ab..f827d990395 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Kickstart_default_user_data.host4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Kickstart_default_user_data.host4dhcp.snap.txt @@ -37,92 +37,92 @@ rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm echo "Starting the subscription-manager registration process" # Set up subscription-manager - # Select package manager for the OS (sets the $PKG_MANAGER* variables) -if [ -z "$PKG_MANAGER" ]; then - if [ -f /etc/os-release ] ; then - . /etc/os-release + # Select package manager for the OS (sets the $PKG_MANAGER* variables) + if [ -z "$PKG_MANAGER" ]; then + if [ -f /etc/os-release ] ; then + . /etc/os-release + fi + + if [ "${NAME%.*}" = 'FreeBSD' ]; then + PKG_MANAGER='pkg' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" + elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then + PKG_MANAGER='dnf' + if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then + PKG_MANAGER='yum' + elif [ -f /etc/system-release ]; then + PKG_MANAGER='yum' + fi + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" + elif [ -f /etc/debian_version ]; then + PKG_MANAGER='apt-get' + PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" + PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" + elif [ -f /etc/arch-release ]; then + PKG_MANAGER='pacman' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" + elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then + PKG_MANAGER='zypper' + PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" + PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" + PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + fi fi - if [ "${NAME%.*}" = 'FreeBSD' ]; then - PKG_MANAGER='pkg' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} delete -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} install -y" - elif [ -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/amazon-linux-release -o -f /etc/system-release ]; then - PKG_MANAGER='dnf' - if [ -f /etc/redhat-release -a "${VERSION_ID%.*}" -le 7 ]; then - PKG_MANAGER='yum' - elif [ -f /etc/system-release ]; then - PKG_MANAGER='yum' - fi - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} upgrade -y" - elif [ -f /etc/debian_version ]; then - PKG_MANAGER='apt-get' - PKG_MANAGER_INSTALL="${PKG_MANAGER} install -y" - PKG_MANAGER_REMOVE="${PKG_MANAGER} remove -y" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o APT::Get::Upgrade-Allow-New='true' upgrade -y" - elif [ -f /etc/arch-release ]; then - PKG_MANAGER='pacman' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --noconfirm -S" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --noconfirm -R" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --noconfirm -S" - elif [ x$ID = xopensuse-tumbleweed -o x$ID = xsles ]; then - PKG_MANAGER='zypper' - PKG_MANAGER_INSTALL="${PKG_MANAGER} --non-interactive install --auto-agree-with-licenses" - PKG_MANAGER_REMOVE="${PKG_MANAGER} --non-interactive remove" - PKG_MANAGER_UPGRADE="${PKG_MANAGER} --non-interactive update" + # Define the path to rhsm.conf + RHSM_CFG=/etc/rhsm/rhsm.conf + + + + # Prepare subscription-manager + if ! [ -x "$(command -v subscription-manager)" ] ; then + $PKG_MANAGER_INSTALL subscription-manager + else + echo "subscription-manager is already installed!" + fi -fi - -# Define the path to rhsm.conf -RHSM_CFG=/etc/rhsm/rhsm.conf - - - -# Prepare subscription-manager -if ! [ -x "$(command -v subscription-manager)" ] ; then - $PKG_MANAGER_INSTALL subscription-manager -else - echo "subscription-manager is already installed!" -fi - -# Check if rhsm.conf exists -if ! [ -f $RHSM_CFG ] ; then - echo "'$RHSM_CFG' not found, cannot configure subscription-manager" - exit 1 -fi - - -# Configure subscription-manager -test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak -subscription-manager config \ - --server.hostname="subscription.rhsm.redhat.com" \ - --server.port="443" \ - --server.prefix="/subscription" \ - --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ - --rhsm.baseurl="https://cdn.redhat.com" - -# Older versions of subscription manager may not recognize -# report_package_profile and package_profile_on_trans options. -# So set them separately and redirect out & error to /dev/null -# to fail silently. -subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true -subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true - -# Configuration for EL6 -if grep --quiet full_refresh_on_yum $RHSM_CFG; then - sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG -else - full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" - sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG -fi - - -# Restart yggdrasild if installed and running -systemctl try-restart yggdrasil >/dev/null 2>&1 || true + # Check if rhsm.conf exists + if ! [ -f $RHSM_CFG ] ; then + echo "'$RHSM_CFG' not found, cannot configure subscription-manager" + exit 1 + fi + + + # Configure subscription-manager + test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak + subscription-manager config \ + --server.hostname="subscription.rhsm.redhat.com" \ + --server.port="443" \ + --server.prefix="/subscription" \ + --rhsm.repo_ca_cert="/etc/rhsm/ca/redhat-uep.pem" \ + --rhsm.baseurl="https://cdn.redhat.com" + + # Older versions of subscription manager may not recognize + # report_package_profile and package_profile_on_trans options. + # So set them separately and redirect out & error to /dev/null + # to fail silently. + subscription-manager config --rhsm.package_profile_on_trans=1 > /dev/null 2>&1 || true + subscription-manager config --rhsm.report_package_profile=1 > /dev/null 2>&1 || true + + # Configuration for EL6 + if grep --quiet full_refresh_on_yum $RHSM_CFG; then + sed -i "s/full_refresh_on_yum\s*=.*$/full_refresh_on_yum = 1/g" $RHSM_CFG + else + full_refresh_config="#config for on-premise management\nfull_refresh_on_yum = 1" + sed -i "/baseurl/a $full_refresh_config" $RHSM_CFG + fi + + + # Restart yggdrasild if installed and running + systemctl try-restart yggdrasil >/dev/null 2>&1 || true # Avoid timeout accessing unreachable repo on air gapped infrastructure, # assuming subscription-manager-syspurpose is installed in custom packages section. if ! rpm --query --quiet subscription-manager-syspurpose ; then