Skip to content

Support for subscription-manager config options #339 #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for subscription-manager config options #339 #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ parameters:
deploy_registry: False

# If using RHEL image, add RHN credentials for RPM installation on VMs
# and check openshift.yaml for further RHN options
rhn_username: ""
rhn_password: ""
rhn_pool: '' # OPTIONAL
Expand Down
8 changes: 8 additions & 0 deletions bastion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ parameters:
type: string
hidden: true

rhn_config_options:
type: string
description: >
Further arguments for subscription-manager config, eg. --server.proxy_hostname
hidden: true
default: ''

# Red Hat satellite subscription parameters
sat6_hostname:
type: string
Expand Down Expand Up @@ -322,6 +329,7 @@ resources:
$OCP_VERSION: {get_param: ocp_version}
$RHN_USERNAME: {get_param: rhn_username}
$RHN_PASSWORD: {get_param: rhn_password}
$RHN_CONFIG_OPTIONS: {get_param: rhn_config_options}
$SAT6_HOSTNAME: {get_param: sat6_hostname}
$SAT6_ORGANIZATION: {get_param: sat6_organization}
$SAT6_ACTIVATIONKEY: {get_param: sat6_activationkey}
Expand Down
8 changes: 7 additions & 1 deletion fragments/rhn-register.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ function use_rhn() {
function register_rhn() {
# RHN_USERNAME=$1
# RHN_PASSWORD=$2
# RHN_CONFIG_OPTIONS=$3

if [ -n "$3" ]; then
subscription-manager config $3
fi

retry subscription-manager register --username="$1" --password="$2"
}

Expand Down Expand Up @@ -60,7 +66,7 @@ if use_satellite6 ; then
install_sat6_ca_certs $SAT6_HOSTNAME
register_sat6 $SAT6_ORGANIZATION $SAT6_ACTIVATIONKEY
elif use_rhn ; then
register_rhn $RHN_USERNAME $RHN_PASSWORD
register_rhn $RHN_USERNAME $RHN_PASSWORD "$RHN_CONFIG_OPTIONS"
else
exit 0
fi
Expand Down
8 changes: 8 additions & 0 deletions infra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ parameters:
type: string
hidden: true

rhn_config_options:
type: string
description: >
Further arguments for subscription-manager config, eg. --server.proxy_hostname
hidden: true
default: ''

# Red Hat satellite subscription parameters
sat6_hostname:
type: string
Expand Down Expand Up @@ -374,6 +381,7 @@ resources:
$OCP_VERSION: {get_param: ocp_version}
$RHN_USERNAME: {get_param: rhn_username}
$RHN_PASSWORD: {get_param: rhn_password}
$RHN_CONFIG_OPTIONS: {get_param: rhn_config_options}
$SAT6_HOSTNAME: {get_param: sat6_hostname}
$SAT6_ORGANIZATION: {get_param: sat6_organization}
$SAT6_ACTIVATIONKEY: {get_param: sat6_activationkey}
Expand Down
8 changes: 8 additions & 0 deletions loadbalancer_dedicated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ parameters:
type: string
hidden: true

rhn_config_options:
type: string
description: >
Further arguments for subscription-manager config, eg. --server.proxy_hostname
hidden: true
default: ''

# Red Hat satellite subscription parameters
sat6_hostname:
type: string
Expand Down Expand Up @@ -313,6 +320,7 @@ resources:
$OCP_VERSION: {get_param: ocp_version}
$RHN_USERNAME: {get_param: rhn_username}
$RHN_PASSWORD: {get_param: rhn_password}
$RHN_CONFIG_OPTIONS: {get_param: rhn_config_options}
$SAT6_HOSTNAME: {get_param: sat6_hostname}
$SAT6_ORGANIZATION: {get_param: sat6_organization}
$SAT6_ACTIVATIONKEY: {get_param: sat6_activationkey}
Expand Down
8 changes: 8 additions & 0 deletions master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ parameters:
type: string
hidden: true

rhn_config_options:
type: string
description: >
Further arguments for subscription-manager config, eg. --server.proxy_hostname
hidden: true
default: ''

# Red Hat satellite subscription parameters
sat6_hostname:
type: string
Expand Down Expand Up @@ -366,6 +373,7 @@ resources:
$OCP_VERSION: {get_param: ocp_version}
$RHN_USERNAME: {get_param: rhn_username}
$RHN_PASSWORD: {get_param: rhn_password}
$RHN_CONFIG_OPTIONS: {get_param: rhn_config_options}
$SAT6_HOSTNAME: {get_param: sat6_hostname}
$SAT6_ORGANIZATION: {get_param: sat6_organization}
$SAT6_ACTIVATIONKEY: {get_param: sat6_activationkey}
Expand Down
8 changes: 8 additions & 0 deletions node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ parameters:
type: string
hidden: true

rhn_config_options:
type: string
description: >
Further arguments for subscription-manager config, eg. --server.proxy_hostname
hidden: true
default: ''

# Red Hat satellite subscription parameters
sat6_hostname:
type: string
Expand Down Expand Up @@ -487,6 +494,7 @@ resources:
$OCP_VERSION: {get_param: ocp_version}
$RHN_USERNAME: {get_param: rhn_username}
$RHN_PASSWORD: {get_param: rhn_password}
$RHN_CONFIG_OPTIONS: {get_param: rhn_config_options}
$SAT6_HOSTNAME: {get_param: sat6_hostname}
$SAT6_ORGANIZATION: {get_param: sat6_organization}
$SAT6_ACTIVATIONKEY: {get_param: sat6_activationkey}
Expand Down
12 changes: 12 additions & 0 deletions openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,13 @@ parameters:
hidden: true
default: ''

rhn_config_options:
type: string
description: >
Further arguments for subscription-manager config, eg. --server.proxy_hostname
hidden: true
default: ''

# Red Hat satellite subscription parameters
sat6_hostname:
type: string
Expand Down Expand Up @@ -564,6 +571,7 @@ resources:
ssh_user: {get_param: ssh_user}
rhn_username: {get_param: rhn_username}
rhn_password: {get_param: rhn_password}
rhn_config_options: {get_param: rhn_config_options}
sat6_hostname: {get_param: sat6_hostname}
sat6_organization: {get_param: sat6_organization}
sat6_activationkey: {get_param: sat6_activationkey}
Expand Down Expand Up @@ -605,6 +613,7 @@ resources:
ssh_user: {get_param: ssh_user}
rhn_username: {get_param: rhn_username}
rhn_password: {get_param: rhn_password}
rhn_config_options: {get_param: rhn_config_options}
sat6_hostname: {get_param: sat6_hostname}
sat6_organization: {get_param: sat6_organization}
sat6_activationkey: {get_param: sat6_activationkey}
Expand Down Expand Up @@ -649,6 +658,7 @@ resources:
ssh_user: {get_param: ssh_user}
rhn_username: {get_param: rhn_username}
rhn_password: {get_param: rhn_password}
rhn_config_options: {get_param: rhn_config_options}
sat6_hostname: {get_param: sat6_hostname}
sat6_organization: {get_param: sat6_organization}
sat6_activationkey: {get_param: sat6_activationkey}
Expand Down Expand Up @@ -703,6 +713,7 @@ resources:
docker_volume_size: {get_param: node_docker_volume_size_gb}
rhn_username: {get_param: rhn_username}
rhn_password: {get_param: rhn_password}
rhn_config_options: {get_param: rhn_config_options}
sat6_hostname: {get_param: sat6_hostname}
sat6_organization: {get_param: sat6_organization}
sat6_activationkey: {get_param: sat6_activationkey}
Expand Down Expand Up @@ -983,6 +994,7 @@ resources:
ssh_user: {get_param: ssh_user}
rhn_username: {get_param: rhn_username}
rhn_password: {get_param: rhn_password}
rhn_config_options: {get_param: rhn_config_options}
sat6_hostname: {get_param: sat6_hostname}
sat6_organization: {get_param: sat6_organization}
sat6_activationkey: {get_param: sat6_activationkey}
Expand Down