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

Add way to specify environment (#3453)

Browse source
This commit is contained in:
Jan Hutař 2016-07-13 17:23:26 +02:00 committed by Matt Clay
parent 57921c0b4d
commit 5eb4e0dd0d
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/modules/packaging/os/redhat_subscription.py
View file

@ -75,6 +75,12 @@ options:
required: False required: False
default: null default: null
version_added: "2.0" version_added: "2.0"
environment:
description:
- Register with a specific environment in the destination org. Used with Red Hat Satellite 6.x or Katello
required: False
default: null
version_added: "2.2"
pool: pool:
description: description:
- Specify a subscription pool name to consume. Regular expressions accepted. - Specify a subscription pool name to consume. Regular expressions accepted.
@ -125,6 +131,13 @@ EXAMPLES = '''
- redhat_subscription: state=present - redhat_subscription: state=present
activationkey=1-222333444 activationkey=1-222333444
pool='^Red Hat Enterprise Server$' pool='^Red Hat Enterprise Server$'
# Register as user credentials into given environment (against Red Hat
# Satellite 6.x), and auto-subscribe to available content.
- redhat_subscription: state=present
username=joe_user password=somepass
environment=Library
autosubscribe=true
''' '''
import os import os
@ -253,7 +266,7 @@ class Rhsm(RegistrationBase):
return False return False
def register(self, username, password, autosubscribe, activationkey, org_id, def register(self, username, password, autosubscribe, activationkey, org_id,
consumer_type, consumer_name, consumer_id, force_register): consumer_type, consumer_name, consumer_id, force_register, environment):
''' '''
Register the current system to the provided RHSM or Sat6 server Register the current system to the provided RHSM or Sat6 server
Raises: Raises:
@ -281,6 +294,8 @@ class Rhsm(RegistrationBase):
args.extend(['--consumerid', consumer_id]) args.extend(['--consumerid', consumer_id])
if force_register: if force_register:
args.extend(['--force']) args.extend(['--force'])
if environment:
args.extend(['--environment', environment])
rc, stderr, stdout = self.module.run_command(args, check_rc=True) rc, stderr, stdout = self.module.run_command(args, check_rc=True)
@ -447,6 +462,7 @@ def main():
autosubscribe = dict(default=False, type='bool'), autosubscribe = dict(default=False, type='bool'),
activationkey = dict(default=None, required=False), activationkey = dict(default=None, required=False),
org_id = dict(default=None, required=False), org_id = dict(default=None, required=False),
environment = dict(default=None, required=False, type='str'),
pool = dict(default='^$', required=False, type='str'), pool = dict(default='^$', required=False, type='str'),
consumer_type = dict(default=None, required=False), consumer_type = dict(default=None, required=False),
consumer_name = dict(default=None, required=False), consumer_name = dict(default=None, required=False),
@ -465,6 +481,7 @@ def main():
autosubscribe = module.params['autosubscribe'] == True autosubscribe = module.params['autosubscribe'] == True
activationkey = module.params['activationkey'] activationkey = module.params['activationkey']
org_id = module.params['org_id'] org_id = module.params['org_id']
environment = module.params['environment']
pool = module.params['pool'] pool = module.params['pool']
consumer_type = module.params["consumer_type"] consumer_type = module.params["consumer_type"]
consumer_name = module.params["consumer_name"] consumer_name = module.params["consumer_name"]
@ -497,7 +514,8 @@ def main():
rhsm.enable() rhsm.enable()
rhsm.configure(**module.params) rhsm.configure(**module.params)
rhsm.register(username, password, autosubscribe, activationkey, org_id, rhsm.register(username, password, autosubscribe, activationkey, org_id,
consumer_type, consumer_name, consumer_id, force_register) consumer_type, consumer_name, consumer_id, force_register,
environment)
subscribed_pool_ids = rhsm.subscribe(pool) subscribed_pool_ids = rhsm.subscribe(pool)
except Exception: except Exception:
e = get_exception() e = get_exception()