Skip to content
Browse files

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

…build' into release/essex-hack/openstack-os-build
  • Loading branch information...
2 parents 9ca0f41 + 84d34ee commit 9091950ba24ee5740e812921ee1c1dfc4e931019 @galthaus committed Apr 25, 2012
Showing with 10 additions and 8 deletions.
  1. +1 −1 barclamps/crowbar
  2. +1 −1 barclamps/deployer
  3. +1 −1 barclamps/dns
  4. +1 −1 barclamps/ganglia
  5. +1 −1 barclamps/nova
  6. +5 −3 extra/barclamp_mgmt_lib.rb
2 barclamps/crowbar
@@ -1 +1 @@
-Subproject commit 8afab2405c2fb04c92fd5584f28a2db05bbc36ad
+Subproject commit de5c43ad86ef3e615a6d956daea72de2a2f482cc
2 barclamps/deployer
@@ -1 +1 @@
-Subproject commit b53050e944b58be7a69465120dcda99e403fa83b
+Subproject commit bdb2b3e9eba988d596110b22799f2456c6fb7422
2 barclamps/dns
@@ -1 +1 @@
-Subproject commit 7b3274c4dd2da9792c44a32f6f7cf90db34b9107
+Subproject commit ed93dbd64e5adc29754cd2e3141764dbef417e0c
2 barclamps/ganglia
@@ -1 +1 @@
-Subproject commit c62619df639346c27c064596980728d987201cb2
+Subproject commit 89c33304d7411d696405ee62c2073ef378903540
2 barclamps/nova
@@ -1 +1 @@
-Subproject commit 999443af7f801a376773f208bfe2ae431bc2cb86
+Subproject commit 278cd772b85ed41a2305daf03d7ed79c5fb99840
View
8 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 )

0 comments on commit 9091950

Please sign in to comment.
Something went wrong with that request. Please try again.