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

Normation · Jan 31, 2017 · fa41285 · fa41285
1 parent f684ece
commit fa41285
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rtf b/rtf
@@ -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':

diff --git a/vagrant.rb b/vagrant.rb
@@ -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