Commit d14a5e8e authored by Volker Hilsheimer's avatar Volker Hilsheimer

Re-populate role data with original values

parent e588223e
......@@ -268,6 +268,7 @@ Vagrant.configure("2") do |config|
# add_role modifies, so make a deep copy of default_roles
roles = Marshal.load(Marshal.dump(default_roles))
roles.concat(machine_roles)
machine["roles"] = roles
roles.each do |role|
begin
add_role(box, role, name) unless role.nil?
......
......@@ -201,6 +201,8 @@ def add_role(box, role, name)
end
activity = false
role_params["role"] = role
role_params["role_path"] = role_path
# check for pre--provisioning script to run locally
if File.file?("#{role_path}/pre-provision.sh")
pre_provision = lambda do |machine|
......@@ -278,7 +280,7 @@ def add_role(box, role, name)
script_ext = ".ps1"
arg_marker = "-"
combine_array = true
script_args = ["-role", role, "-user", $USER]
script_args = ["-user", $USER]
end
upload_path = "c:\\Windows\\temp\\"
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment