Skip to content

Commit 6d1beec

Browse files
committed
Merge tag 'v3.0.4' of github.com:ansiblebit/primogen
version 3.0.4
2 parents 3d99efa + faa8fe1 commit 6d1beec

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

tests/Vagrantfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ CONFIGURATION_FILE = 'boxes.yml'
77

88
Vagrant.configure('2') do |config|
99

10+
# overcome 'stdin: is not a tty' errors when trying to provision on vivid64
11+
config.ssh.pty = true
12+
config.ssh.shell = 'bash'
13+
1014
# puts "[DEBUG] loading box settings from #{CONFIGURATION_FILE}..."
1115
vagrant_environment = YAML.load_file(File.expand_path(CONFIGURATION_FILE, File.dirname(__FILE__)))
1216

@@ -20,7 +24,6 @@ Vagrant.configure('2') do |config|
2024
config.vm.define box_name do |host|
2125

2226
host.vm.box = box_settings['box'] unless not box_settings.key? 'box'
23-
host.vm.hostname = box_name
2427

2528
host.vm.network box_settings['network']['name'], ip: box_settings['network']['ip'] unless box_settings.key? 'network'
2629

0 commit comments

Comments
 (0)