x/packstack
Code Issues Proposed changes

Merge "Add global option --exclude-servers=EXCLUDE_SERVERS"

Browse Source
This commit is contained in:
Jenkins
2013-07-12 09:16:18 +00:00
committed by Gerrit Code Review
parent 31718d510e 13a2f677ed
commit 3b8cd49ef8
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packstack/plugins/prescript_000.py
View File

@@ -133,6 +133,17 @@ def initConfig(controllerObject):
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "exclude-servers",
"USAGE" : "Comma separated list of servers to be excluded from installation in case you are running Packstack the second time with the same answer file and don't want Packstack to touch these servers. Leave plain if you don't need to exclude any server.",
"PROMPT" : "Enter a comma separated list of server(s) to be excluded. Leave plain if you don't need to exclude any server.",
"OPTION_LIST" : [],
"DEFAULT_VALUE" : '',
"MASK_INPUT" : False,
"LOOSE_VALIDATION": False,
"CONF_NAME" : "EXCLUDE_SERVERS",
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
]
groupDict = { "GROUP_NAME" : "GLOBAL",
"DESCRIPTION" : "Global Options",

15
packstack/plugins/puppet_950.py
View File

@@ -46,6 +46,15 @@ def initConfig(controllerObject):
controller.addGroup(groupDict, paramsList)
def getinstallhostlist(conf):
list = []
exclude_list = map(str.strip, conf['EXCLUDE_SERVERS'].split(','))
for host in gethostlist(conf):
if host not in exclude_list:
list.append(host)
return list
def initSequences(controller):
puppetpresteps = [
{'title': 'Clean Up', 'functions':[runCleanup]},
@@ -67,7 +76,7 @@ def runCleanup(config):
def installdeps(config):
for hostname in gethostlist(controller.CONF):
for hostname in getinstallhostlist(controller.CONF):
server = utils.ScriptRunner(hostname)
for package in ("puppet", "openssh-clients", "tar", "nc"):
server.append("rpm -q %s || yum install -y %s" % (package, package))
@@ -90,7 +99,7 @@ def copyPuppetModules(config):
tar_opts = ""
if platform.linux_distribution()[0] == "Fedora":
tar_opts += "--exclude create_resources "
for hostname in gethostlist(controller.CONF):
for hostname in getinstallhostlist(controller.CONF):
host_dir = controller.temp_map[hostname]
puppet_dir = os.path.join(host_dir, basedefs.PUPPET_MANIFEST_RELATIVE)
server.append("cd %s/puppet" % basedefs.DIR_PROJECT_DIR)
@@ -181,7 +190,7 @@ def applyPuppetManifest(config):
waitforpuppet(currently_running)
lastmarker = marker
for hostname in gethostlist(controller.CONF):
for hostname in getinstallhostlist(controller.CONF):
if "%s_" % hostname not in manifest:
continue