diff options
| -rw-r--r-- | Vagrantfile | 51 | ||||
| -rwxr-xr-x | bin/dependencies | 2 | ||||
| -rwxr-xr-x | bin/provision | 2 | ||||
| -rw-r--r-- | manifests/classes/websites.pp | 2 |
4 files changed, 11 insertions, 46 deletions
diff --git a/Vagrantfile b/Vagrantfile index 8999cf0..2e927bc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,12 +1,15 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant::Config.run do |config| +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +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" # Shell provisioner to setup basic environment. - config.vm.provision :shell, :inline => "/vagrant/puppet/bin/provision" + #config.vm.provision :shell, :inline => "/vagrant/puppet/bin/provision" # Enable provisioning with Puppet stand alone. config.vm.provision :puppet do |puppet| @@ -16,46 +19,8 @@ Vagrant::Config.run do |config| 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 + # 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" end diff --git a/bin/dependencies b/bin/dependencies index 78ca659..d77e5f6 100755 --- a/bin/dependencies +++ b/bin/dependencies @@ -23,6 +23,6 @@ if [ "`whoami`" != 'root' ]; then fi # Ensure basic packages are installed. -for package in puppet ruby-hiera-puppet mr whois; do +for package in puppet git mr whois; do provision_package $package done diff --git a/bin/provision b/bin/provision index e200e51..a3e80d7 100755 --- a/bin/provision +++ b/bin/provision @@ -10,7 +10,7 @@ sudo apt-get update && DEBIAN_FRONTEND=noninteractive sudo apt-get dist-upgrade source /vagrant/puppet/bin/dependencies # Ensure additional dependencies are installed. -for package in sqlite3 libsqlite3-ruby libactiverecord-ruby ruby-sqlite3 usbutils; do +for package in ruby-sqlite3 usbutils; do provision_package $package done diff --git a/manifests/classes/websites.pp b/manifests/classes/websites.pp index 35f27c6..a53d507 100644 --- a/manifests/classes/websites.pp +++ b/manifests/classes/websites.pp @@ -37,6 +37,6 @@ class websites inherits websites::hosting { #database::instance { "site": # password => 'xxx', # tag => 'all', - #} + #} } |