From 78b880440000bf526efdec962340368c84466122 Mon Sep 17 00:00:00 2001 From: MURAOKA Yusuke Date: Mon, 15 Aug 2011 16:39:33 +0900 Subject: [PATCH 1/2] Fix to use bazaar. --- cookbooks/nova/recipes/novascript.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cookbooks/nova/recipes/novascript.rb b/cookbooks/nova/recipes/novascript.rb index ec35c5a..64746e8 100644 --- a/cookbooks/nova/recipes/novascript.rb +++ b/cookbooks/nova/recipes/novascript.rb @@ -55,8 +55,9 @@ group node[:nova][:creds][:group] end -execute "../deploy.sh/nova.sh branch #{node[:nova][:source_branch]}" do +execute "../deploy.sh/nova.sh branch #{node[:nova][:bzr_branch]}" do cwd "/tmp/deploy" + environment ({'USE_GIT' => '0'}) user node[:nova][:creds][:user] group node[:nova][:creds][:group] end From 17dcddc9d284d184b9e0b16d9dacf7662b43b604 Mon Sep 17 00:00:00 2001 From: MURAOKA Yusuke Date: Mon, 15 Aug 2011 19:18:53 +0900 Subject: [PATCH 2/2] Treat a repository at /tmp/bzr as development code. --- cookbooks/nova/recipes/novascript.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cookbooks/nova/recipes/novascript.rb b/cookbooks/nova/recipes/novascript.rb index 64746e8..b383c78 100644 --- a/cookbooks/nova/recipes/novascript.rb +++ b/cookbooks/nova/recipes/novascript.rb @@ -38,8 +38,8 @@ group node[:nova][:creds][:group] end -execute "cp -r /tmp/bzr tmp/deploy" do - not_if { File.exists?("/tmp/deploy") } +execute "cp -r /tmp/bzr /tmp/deploy/nova" do + only_if { File.exists?("/tmp/bzr/.bzr") } user node[:nova][:creds][:user] group node[:nova][:creds][:group] end @@ -51,13 +51,14 @@ end execute "rm -rf /tmp/deploy/nova" do + not_if { File.exists?("/tmp/bzr/.bzr") } user node[:nova][:creds][:user] group node[:nova][:creds][:group] end -execute "../deploy.sh/nova.sh branch #{node[:nova][:bzr_branch]}" do +execute "../deploy.sh/nova.sh branch #{node[:nova][:source_branch]}" do + not_if { File.exists?("/tmp/bzr/.bzr") } cwd "/tmp/deploy" - environment ({'USE_GIT' => '0'}) user node[:nova][:creds][:user] group node[:nova][:creds][:group] end