facts/Vagrantfile in simp-rspec-puppet-facts-2.0.0 vs facts/Vagrantfile in simp-rspec-puppet-facts-2.0.1
- old
+ new
@@ -6,12 +6,14 @@
VAGRANTFILE_API_VERSION = '2'
# Used with google provider unless ENV['GOOGLE_ZONE'] is set
DEFAULT_GOOGLE_ZONE = 'us-east1-b'
+VM_FQDN = 'foo.example.com'
+
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.hostname = 'foo.example.com'
+ config.vm.hostname = VM_FQDN
config.vm.provider 'virtualbox' do |vb|
# centos/* boxes don't install vbox guest additions
unless Vagrant.has_plugin?('vagrant-vbguest')
msg = 'ERROR: plugin `vagrant-vbguest` is missing. To fix, run:' +
@@ -84,34 +86,38 @@
# The centos/* machines won't support vboxsf
# config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ['.git/']
config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
unless ENV['CENTOS'] == 'no'
-### config.vm.define "centos-6-x86_64" do |host|
-### host.vm.provider 'virtualbox' do |vb,override|
-### vb.vm.box = "centos/6"
-### end
-### host.vm.provider 'google' do |google,override|
-### google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
-### google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
-### zone.image = 'centos-6-v20170717'
-### end
-### end
-### host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
-### host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'centos 7'"
-### host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
-### end
+ config.vm.define "centos-6-x86_64" do |host|
+ host.vm.provider 'virtualbox' do |vb,override|
+ override.vm.box = "centos/6"
+ end
+ host.vm.provider 'google' do |google,override|
+ google.name = 'foo-centos6-64'
+ google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
+ google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
+ zone.image = 'centos-6-v20170717'
+ end
+# override.vm.provision 'shell', inline: "/use/bin/hostname #{VM_FQDN}"
+ end
+ host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+ host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'centos 6'"
+ host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
+ end
config.vm.define "centos-7-x86_64" do |host|
host.vm.provider 'virtualbox' do |vb,override|
- vb.vm.box = "centos/7"
+ override.vm.box = "centos/7"
end
host.vm.provider 'google' do |google,override|
+ google.name = 'foo-centos7-64'
google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
zone.image = 'centos-7-v20170719'
end
+ # override.vm.provision 'shell', inline: "/usr/bin/hostnamectl set-hostname #{VM_FQDN}"
end
host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'centos 7'"
host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
end
@@ -123,12 +129,12 @@
ver = '6'
if Vagrant.has_plugin?('vagrant-rsync-back')
config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: [".git/", ".idea/"], args: ['--verbose', '--archive', '--delete', '-z', '--prune-empty-dirs', "--include='*/'", "--include='#{os}-#{ver}-x86_64.facts'", "--exclude='*'"]
end
- config.vm.provider 'virtualbox' do |vb|
- vb.vm.box = "anandbitra/redhat-6.5"
+ config.vm.provider 'virtualbox' do |vb,override|
+ override.vm.box = "anandbitra/redhat-6.5"
end
host.vm.provider 'google' do |google,override|
google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
@@ -139,28 +145,30 @@
host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'#{os} #{ver}'"
host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
end
- config.vm.define "redhat-7-x86_64" do |host|
- os = 'redhat'
- ver = '7'
- if Vagrant.has_plugin?('vagrant-rsync-back')
- config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: [".git/", ".idea/"], args: ['--verbose', '--archive', '--delete', '-z', '--prune-empty-dirs', "--include='*/'", "--include='#{os}-#{ver}-x86_64.facts'", "--exclude='*'"]
- end
+ config.vm.define "redhat-7-x86_64" do |host|
+ os = 'redhat'
+ ver = '7'
+ # host.vm.hostname = 'redhat-7-x86_64'
+ if Vagrant.has_plugin?('vagrant-rsync-back')
+ config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: [".git/", ".idea/"], args: ['--verbose', '--archive', '--delete', '-z', '--prune-empty-dirs', "--include='*/'", "--include='#{os}-#{ver}-x86_64.facts'", "--exclude='*'"]
+ end
- host.vm.provider 'virtualbox' do |vb,override|
- vb.vm.box = "mrlesmithjr/rhel-7"
- end
- host.vm.provider 'google' do |google,override|
- google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
- google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
- zone.image = 'rhel-7-v20170719'
- end
- end
- host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
- host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'#{os} #{ver}'"
- host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
- end
+ host.vm.provider 'virtualbox' do |vb,override|
+ override.vm.box = "mrlesmithjr/rhel-7"
+ end
+ host.vm.provider 'google' do |google,override|
+ # google.name = 'foo'
+ google.zone = ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE)
+ google.zone_config ENV.fetch('GOOGLE_ZONE', DEFAULT_GOOGLE_ZONE) do |zone|
+ zone.image = 'rhel-7-v20170719'
+ end
+ end
+ host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+ host.vm.provision "shell", path: "scripts/get_facts_for_each_facter.sh", args: "'#{os} #{ver}'"
+ host.vm.provision "shell", inline: "/sbin/shutdown -h now" unless ENV['SHUTDOWN'] == 'no'
+ end
end
end