From 5512c493e13998d4c83d7eab3d89e5a1c0836566 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 6 Nov 2015 11:00:06 -0200 Subject: Squashed 'puppet/' changes from 26c7b4f..8f7043a 8f7043a Disable backup on puppet-bootstrap.example.org ea035ff Hiera: change domain and location eval order f418291 Adds default node 096b65a Removes darkice module 7663170 Updates TODO d03a934 Deploy: cleanup 66bd115 Deploy: fixes 51b00aa Deploy: apply patches before deployment (2) fc08d8d Deploy: apply patches before deployment 89cc9aa Typo e0169de Masterless puppet is supported a23b6a0 TODO: apply patches 49c4466 Patches, deployment code and TODO update 91477be Use settings::confdir on hiera datadir 381096e TODO cleanup 3d3eb59 Updates TODO 57c6940 Hiera fixes 5a2de12 New hiera scheme for secrets storage 4fc808f Get rid of environments, use git branches instead 47bc020 Updates mrconfig 0d32fa5 New canonical URL 08cd538 Updates TODO 4cfe7fb Site manifests ff61a20 Updates TODO 20f7608 Adds git hooks for push-to-deploy 6759fe7 Another LAMP example a461d98 Really remove bootstrap from mrconfig 1920fba Vagrant: apache user and group f13cb8a Formatting 7425fad Adds puppet-bootstrap.example.org.yaml 4647b02 Vagrant: LAMP example 42ce487 Vagrantfile: example of forwarded port 328873a Fix default hostname 41c9d89 Vagrantfile: set fqdn 72f61db Switch to parametrized classes fd90a64 Vagrant hostname 43816c7 Vagrantfile minor edit 1932d55 Updates mrconfig 39fa2d5 Fix hiera path df5df0b Submodules: force e0b4ebe Updates TODO ee7491e Updates TODO 65746ac TODO: syslog-ng fe79512 TODO: modules 60a3d68 TODO update a7e3e4c Storeconfigs support for vagrant/jessie 0d6de38 Coding style 28bd7e2 Default empty keys.d folder d33c587 Shell provisioner sudo fix 47c83e6 Vagrant provisioning fixes 6f0a560 Removes VIM modelines from Vagrantfile c9e8e7a Call nodo as a parametrized class 3730114 More changes for puppet 3.x 106977f Remove import definitions (deprecated since puppet 3.x) 3c13239 TODO update 5491a52 Mock puppet.conf with environment config 133e36b Initial changes for jessie 67baef2 Git and cgit vhosts 097b8ec Nginx: dhparams git-subtree-dir: puppet git-subtree-split: 8f7043a8948b3236d3c2582c865b27af4613c632 --- Vagrantfile | 56 ++++++++++++-------------------------------------------- 1 file changed, 12 insertions(+), 44 deletions(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index 8999cf0..3ee05e6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,9 +1,12 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" -Vagrant::Config.run do |config| +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "wheezy" + config.vm.box = "jessie" + + # Hostname + config.vm.hostname = "puppet-bootstrap.example.org" # Shell provisioner to setup basic environment. config.vm.provision :shell, :inline => "/vagrant/puppet/bin/provision" @@ -13,49 +16,14 @@ Vagrant::Config.run do |config| puppet.manifest_file = "bootstrap/vagrant.pp" puppet.manifests_path = "puppet/manifests" puppet.module_path = "puppet/modules" + puppet.hiera_config_path = "puppet/hiera.yaml" puppet.temp_dir = "/etc/puppet" puppet.working_directory = "/etc/puppet" end - # Define a Host VM - config.vm.define :host do |host_config| - db_config.vm.box = "host" - web_config.vm.network :hostonly, "192.168.50.101" - end - - # Define a Puppetmaster VM - config.vm.define :master do |master_config| - master_config.vm.box = "master" - master_config.vm.forward_port 8139, 8140 - web_config.vm.network :hostonly, "192.168.50.102" - end - - # Define a Proxy VM - config.vm.define :proxy do |proxy_config| - proxy_config.vm.box = "proxy" - proxy_config.vm.forward_port 8139, 8140 - web_config.vm.network :hostonly, "192.168.50.103" - end - - # Define a Web VM - config.vm.define :web do |web_config| - web_config.vm.box = "web" - web_config.vm.forward_port 80, 8080 - web_config.vm.network :hostonly, "192.168.50.104" - end - - # Define a Storage VM - config.vm.define :storage do |storage_config| - storage_config.vm.box = "storage" - storage_config.vm.network :hostonly, "192.168.50.105" - end - - # Define a Test VM - config.vm.define :test do |test_config| - test_config.vm.box = "test" - test_config.vm.network :hostonly, "192.168.50.106" - end - # Share hiera configuration. - config.vm.share_folder "hiera", "/etc/puppet/hiera", "puppet/hiera", create: true + config.vm.synced_folder "puppet/hiera", "/etc/puppet/hiera" + + # Forwarded ports + #config.vm.network "forwarded_port", guest: 80, host: 8081 end -- cgit v1.2.3