Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #10103: We should not use configure_box in rtf at the moment #88

Merged
merged 1 commit into from
Mar 16, 2017
Merged

Fixes #10103: We should not use configure_box in rtf at the moment #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ def host_lines(platform, hosts, pf_id):
own_server = server

# generic host
line = "configure_box(config, $" + os + ", '" + pf + "', '" + hostname +"'"
line = "configure(config, $" + os + ", '" + pf + "', " + str(pf_id) + ", '" + hostname +"', " + host_id
line += ", setup:'" + host['rudder-setup'] + "', host_list:'" + hostnames + "'"
# rudder host
if host['rudder-setup'] != 'ncf' and host['rudder-setup'] != 'empty':
Expand Down
3 changes: 2 additions & 1 deletion vagrant.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ def configure(config, os, pf_name, pf_id, host_name, host_id,
server_config.vm.network :private_network, ip: ip
server_config.vm.hostname = host_name
# this is lazy evaluated and so will contain the last definition of host list
host_list = $platforms[pf_name]['host_list'].join(" ") + " " + host_list
pf_hostlist = $platforms.fetch(pf_name) { { 'host_list' => [] } }
host_list = pf_hostlist['host_list'].join(" ") + " " + host_list
server_config.vm.provision :shell, :inline => command.sub("@host_list@", host_list)
end
end
Expand Down