x/packstack
Code Issues Proposed changes

Only apply the swift::ringsync to storage nodes that aren't a proxy

Browse Source
This commit is contained in:
Derek Higgins
2012-12-21 12:05:02 -05:00
parent 0df487b1fb
commit 56d0faff44
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/modules/ospluginutils.py
View File

@@ -102,7 +102,7 @@ def isErrorException(line):
return False
_re_errorline = re.compile('err: | Syntax error at')
_re_errorline = re.compile('err: | Syntax error at|^Duplicate definition:')
_re_color = re.compile('\x1b.*?\d\dm')
def validate_puppet_logfile(logfile):
"""

2
packstack/plugins/swift_600.py
View File

@@ -154,7 +154,7 @@ def createproxymanifest():
manifestfile = "%s_swift.pp"%controller.CONF['CONFIG_SWIFT_PROXY_HOSTS']
manifestdata = getManifestTemplate("swift_proxy.pp")
# If the proxy server is also a storage server then swift::ringsync will be included for the storage server
if controller.CONF['CONFIG_SWIFT_PROXY_HOSTS'] not in controller.CONF["CONFIG_SWIFT_STORAGE_HOSTS"].split(","):
if controller.CONF['CONFIG_SWIFT_PROXY_HOSTS'] not in [h['host'] for h in devices]:
manifestdata += 'swift::ringsync{["account","container","object"]:\n ring_server => "%s"\n}'%controller.CONF['CONFIG_SWIFT_BUILDER_HOST']
appendManifestFile(manifestfile, manifestdata)