]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Don't hit an AttributeError if ctx.config['overrides'] is set to None
authorZack Cerza <zack@cerza.org>
Mon, 12 Aug 2013 21:18:42 +0000 (16:18 -0500)
committerZack Cerza <zack@cerza.org>
Mon, 12 Aug 2013 21:18:42 +0000 (16:18 -0500)
teuthology/task/install.py

index 87e105deb9a2cf162f0a7d271b373d0ec3fc94e7..b90a67e3559d735ba10be686a80cbcc692acc6b1 100644 (file)
@@ -851,8 +851,10 @@ def task(ctx, config):
 
     project, = config.get('project', 'ceph'),
     log.debug('project %s' % project)
-    overrides = ctx.config.get('overrides', {}).get('install', {})
-    teuthology.deep_merge(config, overrides.get(project, {}))
+    overrides = ctx.config.get('overrides', {})
+    if overrides:
+        install_overrides = overrides.get('install', {})
+        teuthology.deep_merge(config, install_overrides.get(project, {}))
     log.debug('config %s' % config)
 
     # Flavor tells us what gitbuilder to fetch the prebuilt software