x/packstack
Code Issues Proposed changes

Adding an option to subscribe to RHEL beta repositories

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=910210

Change-Id: I4e1e4356eb9a78cdc87d9687f9be41e22b28b85b
This commit is contained in:
Derek Higgins
2013-02-11 20:37:26 -05:00
parent c75d51877e
commit 27b6172cd3
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packstack/plugins/serverprep_901.py
View File

@@ -72,6 +72,18 @@ def initConfig(controllerObject):
"USE_DEFAULT" : False, "USE_DEFAULT" : False,
"NEED_CONFIRM" : False, "NEED_CONFIRM" : False,
"CONDITION" : False }, "CONDITION" : False },
{"CMD_OPTION" : "rh-beta-repo",
"USAGE" : "To subscribe each server with Red Hat subscription manager, to Red Hat Beta RPM's",
"PROMPT" : "To subscribe each server to Red Hat Beta RPM's enter y",
"OPTION_LIST" : ["y", "n"],
"VALIDATORS" : [validate.validate_options],
"DEFAULT_VALUE" : "n",
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_RH_BETA_REPO",
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "rhn-satellite-server", {"CMD_OPTION" : "rhn-satellite-server",
"USAGE" : ("To subscribe each server with RHN Satellite," "USAGE" : ("To subscribe each server with RHN Satellite,"
"fill Satellite's URL here. Note that either " "fill Satellite's URL here. Note that either "
@@ -301,7 +313,7 @@ def run_rhn_reg(host, server_url, username=None, password=None,
server.execute(maskList=mask) server.execute(maskList=mask)
def run_rhsm_reg(host, username, password): def run_rhsm_reg(host, username, password, beta):
""" """
Registers given host to Red Hat Repositories via subscription manager. Registers given host to Red Hat Repositories via subscription manager.
""" """
@@ -322,6 +334,8 @@ def run_rhsm_reg(host, username, password):
server.append("yum clean all") server.append("yum clean all")
server.append("yum-config-manager --enable rhel-server-ost-6-folsom-rpms") server.append("yum-config-manager --enable rhel-server-ost-6-folsom-rpms")
if beta:
server.append("yum-config-manager --enable rhel-6-server-beta-rpms")
server.append("yum clean metadata") server.append("yum clean metadata")
server.execute(maskList=[password]) server.execute(maskList=[password])
@@ -388,7 +402,7 @@ def serverprep():
# Subscribe to Red Hat Repositories if configured # Subscribe to Red Hat Repositories if configured
if rh_username: if rh_username:
run_rhsm_reg(hostname, rh_username, rh_password) run_rhsm_reg(hostname, rh_username, rh_password, config["CONFIG_RH_BETA_REPO"] == 'y')
# Subscribe to RHN Satellite if configured # Subscribe to RHN Satellite if configured
if satellite_url and hostname not in sat_registered: if satellite_url and hostname not in sat_registered:

1
tests/test_plugin_serverprep.py
View File

@@ -35,6 +35,7 @@ class OSPluginUtilsTestCase(PackstackTestCaseMixin, TestCase):
serverprep_901.controller.CONF["CONFIG_REPO"] = "" serverprep_901.controller.CONF["CONFIG_REPO"] = ""
serverprep_901.controller.CONF["CONFIG_RH_USERNAME"] = "testuser" serverprep_901.controller.CONF["CONFIG_RH_USERNAME"] = "testuser"
serverprep_901.controller.CONF["CONFIG_RH_PASSWORD"] = password serverprep_901.controller.CONF["CONFIG_RH_PASSWORD"] = password
serverprep_901.controller.CONF["CONFIG_RH_BETA_REPO"] = "n"
serverprep_901.controller.CONF["CONFIG_SATELLITE_FLAGS"] = "" serverprep_901.controller.CONF["CONFIG_SATELLITE_FLAGS"] = ""
serverprep_901.controller.CONF["CONFIG_SATELLITE_URL"] = "" serverprep_901.controller.CONF["CONFIG_SATELLITE_URL"] = ""