Merge remote-tracking branch 'origin/release/essex-hack/openstack-os-…

…build' into release/essex-hack/openstack-os-build
galthaus · Apr 25, 2012 · 9091950 · 9091950
2 parents 9ca0f41 + 84d34ee
commit 9091950
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/barclamps/crowbar b/barclamps/crowbar
diff --git a/barclamps/deployer b/barclamps/deployer
diff --git a/barclamps/dns b/barclamps/dns
diff --git a/barclamps/ganglia b/barclamps/ganglia
diff --git a/barclamps/nova b/barclamps/nova
diff --git a/extra/barclamp_mgmt_lib.rb b/extra/barclamp_mgmt_lib.rb
@@ -99,9 +99,11 @@ def catalog(path, options={})
     cat['barclamps'][name]['order'] = bc['crowbar']['order'] if bc['crowbar']['order']
     cat['barclamps'][name]['run_order'] = bc['crowbar']['run_order'] if bc['crowbar']['run_order']
     cat['barclamps'][name]['chef_order'] = bc['crowbar']['chef_order'] if bc['crowbar']['chef_order']
-    cat['barclamps'][name]['date'] = bc['git']['date'] if bc['git']['date']
-    cat['barclamps'][name]['commit'] = bc['git']['commit'] if bc['git']['commit']
-
+    if bc['git']
+      cat['barclamps'][name]['date'] = bc['git']['date'] if bc['git']['date']
+      cat['barclamps'][name]['commit'] = bc['git']['commit'] if bc['git']['commit']
+    end
+
   end
   File.open( File.join(CROWBAR_PATH, 'config', 'catalog.yml'), 'w' ) do |out|
     YAML.dump( cat, out )