Merge pull request #1280 from crawford/vagrant

coreos-base/oem-vagrant: various fixes

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile

@@ -10,6 +10,9 @@ require_relative 'configure_networks.rb'
 require_relative 'base_mac.rb'
 
 Vagrant.configure("2") do |config|
+  # always use Vagrants insecure key
+  config.ssh.insert_key = false
+
   # SSH in as the default 'core' user, it has the vagrant ssh key.
   config.ssh.username = "core"
 

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb

@@ -26,7 +26,7 @@ module VagrantPlugins
             temp.close
 
             path = "/var/tmp/hostname.yml"
-            path_esc = path.gsub("/", "-")
+            path_esc = path.gsub("/", "-")[1..-1]
             comm.upload(temp.path, path)
             comm.sudo("systemctl start system-cloudinit@#{path_esc}.service")
           end

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb

@@ -87,7 +87,7 @@ module VagrantPlugins
             temp.close
 
             path = "/var/tmp/networks.yml"
-            path_esc = path.gsub("/", "-")
+            path_esc = path.gsub("/", "-")[1..-1]
             comm.upload(temp.path, path)
             comm.sudo("systemctl start system-cloudinit@#{path_esc}.service")
           end