diff --git a/packstack/modules/ospluginutils.py b/packstack/modules/ospluginutils.py
index 917c6e80c..3248dc9c1 100644
--- a/packstack/modules/ospluginutils.py
+++ b/packstack/modules/ospluginutils.py
@@ -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):
     """
diff --git a/packstack/plugins/swift_600.py b/packstack/plugins/swift_600.py
index 22e16f6aa..1a20f19cd 100644
--- a/packstack/plugins/swift_600.py
+++ b/packstack/plugins/swift_600.py
@@ -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)