ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

redhat_subscription: improve wording wrt Satellite (#5581)

Browse source 
Do not mention an explicit version of Satellite for an environment to
use; future versions of Satellite will support that, and older versions
are long EOL.

Also mention Katello next to Red Hat Satellite.
This commit is contained in:
Pino Toscano 2022-11-26 18:37:58 +01:00 committed by GitHub
parent 11e1423f60
commit 911769d2f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/modules/redhat_subscription.py
View file

@ -34,15 +34,15 @@ options:
type: str type: str
username: username:
description: description:
- access.redhat.com or Sat6 username - access.redhat.com or Red Hat Satellite or Katello username
type: str type: str
password: password:
description: description:
- access.redhat.com or Sat6 password - access.redhat.com or Red Hat Satellite or Katello password
type: str type: str
server_hostname: server_hostname:
description: description:
- Specify an alternative Red Hat Subscription Management or Sat6 server - Specify an alternative Red Hat Subscription Management or Red Hat Satellite or Katello server
type: str type: str
server_insecure: server_insecure:
description: description:
@ -50,12 +50,12 @@ options:
type: str type: str
server_prefix: server_prefix:
description: description:
- Specify the prefix when registering to the Red Hat Subscription Management or Sat6 server. - Specify the prefix when registering to the Red Hat Subscription Management or Red Hat Satellite or Katello server.
type: str type: str
version_added: 3.3.0 version_added: 3.3.0
server_port: server_port:
description: description:
- Specify the port when registering to the Red Hat Subscription Management or Sat6 server. - Specify the port when registering to the Red Hat Subscription Management or Red Hat Satellite or Katello server.
type: str type: str
version_added: 3.3.0 version_added: 3.3.0
rhsm_baseurl: rhsm_baseurl:
@ -98,7 +98,7 @@ options:
type: str type: str
environment: environment:
description: description:
- Register with a specific environment in the destination org. Used with Red Hat Satellite 6.x or Katello - Register with a specific environment in the destination org. Used with Red Hat Satellite or Katello
type: str type: str
pool: pool:
description: description:
@ -229,7 +229,7 @@ EXAMPLES = '''
org_id: 222333444 org_id: 222333444
pool: '^Red Hat Enterprise Server$' pool: '^Red Hat Enterprise Server$'
- name: Register as user credentials into given environment (against Red Hat Satellite 6.x), and auto-subscribe. - name: Register as user credentials into given environment (against Red Hat Satellite or Katello), and auto-subscribe.
community.general.redhat_subscription: community.general.redhat_subscription:
state: present state: present
username: joe_user username: joe_user
@ -397,7 +397,9 @@ class Rhsm(RegistrationBase):
rhsm_baseurl, server_insecure, server_hostname, server_proxy_hostname, rhsm_baseurl, server_insecure, server_hostname, server_proxy_hostname,
server_proxy_port, server_proxy_user, server_proxy_password, release): server_proxy_port, server_proxy_user, server_proxy_password, release):
''' '''
Register the current system to the provided RHSM or Sat6 server Register the current system to the provided RHSM or Red Hat Satellite
or Katello server
Raises: Raises:
* Exception - if error occurs while running command * Exception - if error occurs while running command
''' '''