From 98406462d1144156ca73d8c772fdf201986c9dbe Mon Sep 17 00:00:00 2001 From: Vincent Van der Kussen Date: Sat, 23 Mar 2013 22:04:48 +0100 Subject: [PATCH] Made user and password options that can be passed to the module --- library/rhn_channel | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/library/rhn_channel b/library/rhn_channel index e7a8e22588..1c09c66276 100755 --- a/library/rhn_channel +++ b/library/rhn_channel @@ -31,9 +31,18 @@ options: description: - The full url to the rhn/sattelite api required: true + default: https://rhn.redhat.com/rpc/api + user: + description: + - the user to login to rhn/sattelite + required: true + pwd: + description: + - the user's password + required: true examples: - code: rhn_channel name=rhel-x86_64-server-v2vwin-6 sysname=server01 - url=https://rhn.redhat.com/rpc/api + url=https://rhn.redhat.com/rpc/api user=rhnuser pwd=guessme description: add software channel rhel-x86_64-server-v2vwin-6 to server01 in Red Hat Network ''' @@ -93,6 +102,8 @@ def main(): name = dict(required=True), sysname = dict(required=True), url = dict(required=True), + user = dict(required=True), + pwd = dict(required=True), ) # supports_check_mode=True ) @@ -101,10 +112,10 @@ def main(): channelname = module.params['name'] systname = module.params['sysname'] saturl = module.params['url'] + user = module.params['user'] + pwd = module.params['pwd'] #initialize connection - user = "" - pwd = "" client = xmlrpclib.Server(saturl, verbose=0) session = client.auth.login(user, pwd) @@ -125,7 +136,7 @@ def main(): if state == 'absent': if not channelname in chans: - module.exit_json(changed=False, msg="System not subscribed to channel %s." % channelname) + module.exit_json(changed=False, msg="Not subscribed to channel %s." % channelname) else: unsubscribe_channels(channelname, client, session, systname, sys_id) module.exit_json(changed=True, msg="Channel %s removed" % channelname)