Merge pull request #154 from galthaus/20f5befc4694435c6cee593087a9201…

…1df21fd02 Fix build break around dynamic links - pulls in some of rob's import changes and Andi's nagios changes. [5/6]
crowbar · Mar 2, 2012 · ebf11ec · ebf11ec
2 parents d29d5c6 + 20f5bef
commit ebf11ec
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/barclamps/crowbar b/barclamps/crowbar
diff --git a/barclamps/ganglia b/barclamps/ganglia
diff --git a/barclamps/nagios b/barclamps/nagios
diff --git a/barclamps/provisioner b/barclamps/provisioner
diff --git a/extra/barclamp_mgmt_lib.rb b/extra/barclamp_mgmt_lib.rb
@@ -90,6 +90,9 @@ def catalog(path)
     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']
+
   end
   File.open( File.join(CROWBAR_PATH, 'config', 'catalog.yml'), 'w' ) do |out|
     YAML.dump( cat, out )