Skip to content

Commit

Permalink
Removed Puppet module. Change Vagrantfile to 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
paolooo committed Dec 11, 2013
1 parent 5247e0a commit dd46220
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 42 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,3 +0,0 @@
[submodule "puppet"]
path = puppet
url = https://github.com/paolooo/puppet.git
83 changes: 45 additions & 38 deletions Vagrantfile
@@ -1,41 +1,59 @@
# -*- 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|
# All Vagrant configuration is done here. The most common configuration
# options are documented and commented below. For a complete reference,
# please see the online documentation at vagrantup.com.

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "precise32"
config.vm.box = "base"

# The url from where the 'config.vm.box' box will be fetched if it
# doesn't already exist on the user's system.
config.vm.box_url = "http://files.vagrantup.com/precise32.box"
# config.vm.box_url = "http://domain.com/path/to/above.box"

# Boot with a GUI so you can see the screen. (Default is headless)
# config.vm.boot_mode = :gui
# Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine. In the example below,
# accessing "localhost:8080" will access port 80 on the guest machine.
# config.vm.network :forwarded_port, guest: 80, host: 8080

# Assign this VM to a host-only network IP, allowing you to access it
# via the IP. Host-only networks can talk to the host machine as well as
# any other machines on the same network, but cannot be accessed (through this
# network interface) by any external networks.
config.vm.network :hostonly, "192.168.33.10"
# Create a private network, which allows host-only access to the machine
# using a specific IP.
# config.vm.network :private_network, ip: "192.168.33.10"

# Assign this VM to a bridged network, allowing you to connect directly to a
# network using the host's network device. This makes the VM appear as another
# physical device on your network.
# config.vm.network :bridged
# Create a public network, which generally matched to bridged network.
# Bridged networks make the machine appear as another physical device on
# your network.
# config.vm.network :public_network

# Forward a port from the guest to the host, which allows for outside
# computers to access the VM, whereas host only networking does not.
config.vm.forward_port 80, 8082
# If true, then any SSH connections made will enable agent forwarding.
# Default value: false
# config.ssh.forward_agent = true

# Share an additional folder to the guest VM. The first argument is
# an identifier, the second is the path on the guest to mount the
# folder, and the third is the path on the host to the actual folder.
config.vm.share_folder "v-data", "/vagrant/db", "./db"
config.vm.share_folder "v-web", "/vagrant/www", "./www"
# the path on the host to the actual folder. The second argument is
# the path on the guest to mount the folder. And the optional third
# argument is a set of non-required options.
# config.vm.synced_folder "../data", "/vagrant_data"

# Provider-specific configuration so you can fine-tune various
# backing providers for Vagrant. These expose provider-specific options.
# Example for VirtualBox:
#
# config.vm.provider :virtualbox do |vb|
# # Don't boot with headless mode
# vb.gui = true
#
# # Use VBoxManage to customize the VM. For example to change memory:
# vb.customize ["modifyvm", :id, "--memory", "1024"]
# end
#
# View the documentation for the provider you're using for more
# information on available options.

# Enable provisioning with Puppet stand alone. Puppet manifests
# are contained in a directory path relative to this Vagrantfile.
Expand All @@ -55,24 +73,13 @@ Vagrant::Config.run do |config|
# # Managed by Puppet.\n"
# # }
#
config.vm.provision :puppet do |puppet|
puppet.facter = {
"fqdn" => "dev.lamp.mysql",
"hostname" => "www",
"docroot" => "/vagrant/www",
"host" => 'localhost',
"username" => 'root',
"password" => '123',
"db_name" => "development",
"db_location" => "/vagrant/db/development.sqlite"
}
puppet.manifests_path = "puppet/manifests"
puppet.module_path = ["puppet/modules", "extras/modules"]
puppet.manifest_file = "init.pp"
end
# config.vm.provision :puppet do |puppet|
# puppet.manifests_path = "manifests"
# puppet.manifest_file = "site.pp"
# end

# Enable provisioning with chef solo, specifying a cookbooks path, roles
# path, and data_bags path (all relative to this Vagrantfile), and adding
# path, and data_bags path (all relative to this Vagrantfile), and adding
# some recipes and/or roles.
#
# config.vm.provision :chef_solo do |chef|
Expand Down Expand Up @@ -104,7 +111,7 @@ Vagrant::Config.run do |config|
# If you're using the Opscode platform, your validator client is
# ORGNAME-validator, replacing ORGNAME with your organization name.
#
# IF you have your own Chef Server, the default validation client name is
# If you have your own Chef Server, the default validation client name is
# chef-validator, unless you changed the configuration.
#
# chef.validation_client_name = "ORGNAME-validator"
Expand Down
1 change: 0 additions & 1 deletion puppet
Submodule puppet deleted from cc6ebc

0 comments on commit dd46220

Please sign in to comment.