x
/
fuel-ccp-installer
Code Issues Proposed changes

Fix SSH settings on vagrant deployment 

This works around a bug where ssh-ing to the first node to
pgrep for apt is broken because the initial call gets grabbed
by pgrep.

Also set unprivileged mode for kargo_deploy.sh invocation so that
it doesn't write root owned files in vagrant home directory.

Change-Id: I487fba3ed3529d23b0eaa4af63c9d14899cf5f95
This commit is contained in:
Matthew Mosesohn 2016-08-18 15:13:00 +03:00
parent 87136b928a
commit 49196228a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Vagrantfile vendored
View File

@ -63,14 +63,14 @@ Vagrant.configure("2") do |config|
"KARGO_REPO" => $kargo_repo, "KARGO_REPO" => $kargo_repo,
"KARGO_COMMIT" => $kargo_commit, "KARGO_COMMIT" => $kargo_commit,
"SLAVE_IPS" => "\"#{node_ips.join(' ')}\"", "SLAVE_IPS" => "\"#{node_ips.join(' ')}\"",
"ADMIN_IP" => ip, "ADMIN_IP" => "local",
"IMAGE_PATH" => $box.sub('/','_'), "IMAGE_PATH" => $box.sub('/','_'),
} }
env = [] env = []
vars.each { |k, v| env << "#{k}=#{v}" } vars.each { |k, v| env << "#{k}=#{v}" }
deploy = with_env("/vagrant/utils/jenkins/kargo_deploy.sh", env) deploy = with_env("/vagrant/utils/jenkins/kargo_deploy.sh", env)
config.vm.provision "shell", inline: "#{deploy}" config.vm.provision "shell", inline: "#{deploy}", privileged: false
end end
end end
end end