lib/gaptool-client.rb in gaptool-client-0.7.4 vs lib/gaptool-client.rb in gaptool-client-0.7.5
- old
+ new
@@ -298,10 +298,15 @@
'hostname' => node['hostname'],
'instance' => node['instance'],
'zone' => node['zone'],
'itype' => node['itype'],
'apps' => eval(node['apps'] || '[]'),
+ 'gaptool' => {
+ 'user' => ENV['GT_USER'],
+ 'key' => ENV['GT_KEY'],
+ 'url' => ENV['GT_URL']
+ }
}.merge(attrs)
git="git fetch --all; git reset --hard origin/`git rev-parse --abbrev-ref HEAD`"
unless chef_branch.nil?
json['chefbranch'] = chef_branch
@@ -391,10 +396,15 @@
'itype' => node['itype'],
'apps' => node['apps'],
'deploy_apps' => node['apps_to_deploy'],
'rollback' => rollback?,
'branch' => branch || 'master',
- 'migrate' => migrate?
+ 'migrate' => migrate?,
+ 'gaptool' => {
+ 'user' => ENV['GT_USER'],
+ 'key' => ENV['GT_KEY'],
+ 'url' => ENV['GT_URL']
+ }
}.merge(attrs).to_json
commands = [
"cd ~admin/ops; git pull",
"echo '#{json}' > ~admin/solo.json",
"sudo chef-solo -c ~admin/ops/cookbooks/solo.rb -j ~admin/solo.json -E #{environment}"