Added git pull to make puppet apply pass when Gemfiles have changed

ngiger · Dec 16, 2013 · a002217 · a002217
1 parent 8f684cb
commit a002217
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/static-modules/oddb_org/manifests/currency.pp b/static-modules/oddb_org/manifests/currency.pp
@@ -10,7 +10,7 @@
 
   $currency_repo = '/opt/src/ycurrency'
   exec { "$bundle_currency":
-    command => "eselect ruby set ruby19 && bundle install && touch $bundle_currency",
+    command => "eselect ruby set ruby19 && git pull && bundle install && touch $bundle_currency",
     creates => "$bundle_currency",
     cwd => "$currency_repo",
     path => '/usr/local/bin:/usr/bin:/bin',

diff --git a/static-modules/oddb_org/manifests/migel.pp b/static-modules/oddb_org/manifests/migel.pp
@@ -47,7 +47,7 @@
   $migel_bundle_installed = "/opt/migel_bundle_installed.okay"
   exec{ "$migel_bundle_installed":
     cwd     => "$migel_git",
-    command => "bundle install && touch $migel_bundle_installed",
+    command => "git pull && bundle install --without debugger && touch $migel_bundle_installed",
     creates => "$migel_bundle_installed",
     require => [ 
       Vcsrepo["$migel_git"],

diff --git a/static-modules/oddb_org/manifests/oddb_git.pp b/static-modules/oddb_org/manifests/oddb_git.pp
@@ -47,7 +47,7 @@
   package{'imagemagick':}  # needed for gem rmagick
 
   exec { "$bundle_oddb_org":
-    command => "eselect ruby set ruby19 && bundle install && touch $bundle_oddb_org",
+    command => "eselect ruby set ruby19 && git pull && bundle install && touch $bundle_oddb_org",
     creates => "$bundle_oddb_org",
     cwd => "$ODDB_HOME",
     path => "$path",