vagrant-puppet-install 2.5.0 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/lib/vagrant-puppet-install/action/install_puppet.rb +1 -1
  4. data/lib/vagrant-puppet-install/version.rb +1 -1
  5. data/test/acceptance/virtualbox/Vagrantfile +9 -13
  6. data/test/support/puppet_install_script/{centos_6_x.sh → shell_install.sh} +1 -11
  7. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 45ad0388b5d74099abab471358cd265018ed6755
4
- data.tar.gz: 8dc1380f5b877af48f7b01bc8ce57866071205d3
3
+ metadata.gz: 736eaea9ebef8dc64fa71ac2aec11d04b5f0a7af
4
+ data.tar.gz: cee07e33b748975251d25a47360c9763f12da82d
5
5
  SHA512:
6
- metadata.gz: b36a925d100c275c3386309f96494ac2102697aba0989ed18a2dc56e3fbf96f668d17851dc7a4589e8e84844b796db52172448d3c523f2cfd992cb490c79f41b
7
- data.tar.gz: 13894480fe4620767b61058157a9d7f9d9e8047c7d928f4af6fbad970ef7ba17d68f78c6b463c36362efe579d512430c86e7968e43de9c022e33a1ae3f058fd7
6
+ metadata.gz: 9a731ba03aee1753593a568474b61141d5a0d98dccc62ae9781d59f3f8cdb03eb18b3f1265cad54413aa67b9c1b83c5f15d363ed56a63bbc600d3595ddca6883
7
+ data.tar.gz: 95add6b967ba8afc1d61e889e5b596f33c33092d7936d667ba54b7b667dc5fafd057ca4981d40cde43d7a3c7cb3dfe21d1863e34dd001af6e2392f76970a9ffb
data/Gemfile CHANGED
@@ -6,7 +6,7 @@ group :development do
6
6
  # We depend on Vagrant for development, but we don't add it as a
7
7
  # gem dependency because we expect to be installed within the
8
8
  # Vagrant environment itself using `vagrant plugin`.
9
- gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
9
+ gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.6.3"
10
10
  end
11
11
 
12
12
  group :acceptance do
data/lib/vagrant-puppet-install/action/install_puppet.rb CHANGED
@@ -23,7 +23,7 @@ module VagrantPlugins
23
23
  return unless @machine.communicate.ready? && provision_enabled?(env)
24
24
 
25
25
  # Perform delayed validation
26
- @machine.config.puppet.validate!(@machine)
26
+ @machine.config.puppet_install.validate!(@machine)
27
27
 
28
28
  desired_version = @machine.config.puppet_install.puppet_version
29
29
  unless desired_version.nil?
data/lib/vagrant-puppet-install/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module PuppetInstall
3
- VERSION = "2.5.0"
3
+ VERSION = "2.6.0"
4
4
  end
5
5
  end
data/test/acceptance/virtualbox/Vagrantfile CHANGED
@@ -9,8 +9,7 @@ Vagrant.configure("2") do |config|
9
9
  config.vm.define :ubuntu do |ubuntu|
10
10
  ubuntu.puppet_install.puppet_version = '3.6.1'
11
11
 
12
- ubuntu.vm.box = "precise64"
13
- ubuntu.vm.box_url = "http://files.vagrantup.com/precise64.box"
12
+ ubuntu.vm.box = "chef/ubuntu-12.04"
14
13
 
15
14
  ubuntu.vm.provision :puppet do |puppet|
16
15
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
@@ -23,10 +22,9 @@ Vagrant.configure("2") do |config|
23
22
 
24
23
  config.vm.define :centos do |centos|
25
24
  centos.puppet_install.puppet_version = :latest
26
- centos.vm.box = 'centos-64-x64-vbox4210-nocm'
27
- centos.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
25
+ centos.vm.box = "chef/centos-6.5"
28
26
 
29
- config.vm.provision :puppet do |puppet|
27
+ centos.vm.provision :puppet do |puppet|
30
28
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
31
29
  puppet.manifest_file = "base.pp"
32
30
  end
@@ -37,11 +35,10 @@ Vagrant.configure("2") do |config|
37
35
 
38
36
  config.vm.define :new_install_url do |new_install_url|
39
37
  new_install_url.puppet_install.puppet_version = :latest
40
- config.puppet_install.install_url = 'https://raw.githubusercontent.com/hashicorp/puppet-bootstrap/master/centos_6_x.sh'
41
- new_install_url.vm.box = 'centos-64-x64-vbox4210-nocm'
42
- new_install_url.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
38
+ new_install_url.puppet_install.install_url = 'https://raw.githubusercontent.com/hashicorp/puppet-bootstrap/master/centos_6_x.sh'
39
+ new_install_url.vm.box = "chef/centos-6.5"
43
40
 
44
- config.vm.provision :puppet do |puppet|
41
+ new_install_url.vm.provision :puppet do |puppet|
45
42
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
46
43
  puppet.manifest_file = "base.pp"
47
44
  end
@@ -52,11 +49,10 @@ Vagrant.configure("2") do |config|
52
49
 
53
50
  config.vm.define :new_install_path do |new_install_path|
54
51
  new_install_path.puppet_install.puppet_version = :latest
55
- config.puppet_install.install_url = File.expand_path('../../support/puppet_install_script/centos_6_x.sh')
56
- new_install_path.vm.box = 'centos-64-x64-vbox4210-nocm'
57
- new_install_path.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
52
+ new_install_path.puppet_install.install_url = File.expand_path('../../support/puppet_install_script/shell_install.sh')
53
+ new_install_path.vm.box = "chef/centos-6.5"
58
54
 
59
- config.vm.provision :puppet do |puppet|
55
+ new_install_path.vm.provision :puppet do |puppet|
60
56
  puppet.manifests_path = File.expand_path('../../../support/manifests', __FILE__)
61
57
  puppet.manifest_file = "base.pp"
62
58
  end
data/test/support/puppet_install_script/{centos_6_x.sh → shell_install.sh} RENAMED
@@ -2,20 +2,10 @@
2
2
 
3
3
  set -e
4
4
 
5
- echo "THIS IS RUNNING ON YOUR MACHINE!"
5
+ echo "Spec test running now!"
6
6
 
7
7
  REPO_URL="http://yum.puppetlabs.com/el/6/products/i386/puppetlabs-release-6-7.noarch.rpm"
8
8
 
9
- if [ "$EUID" -ne "0" ]; then
10
- echo "This script must be run as root." >&2
11
- exit 1
12
- fi
13
-
14
- if which puppet > /dev/null 2>&1; then
15
- echo "Puppet is already installed."
16
- exit 0
17
- fi
18
-
19
9
  # Install puppet labs repo
20
10
  echo "Configuring PuppetLabs repo..."
21
11
  repo_path=$(mktemp)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-puppet-install
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0
4
+ version: 2.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Seth Chisamore
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-08-03 00:00:00.000000000 Z
13
+ date: 2014-08-04 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
@@ -99,7 +99,7 @@ files:
99
99
  - test/acceptance/rackspace/Vagrantfile
100
100
  - test/acceptance/virtualbox/Vagrantfile
101
101
  - test/support/manifests/base.pp
102
- - test/support/puppet_install_script/centos_6_x.sh
102
+ - test/support/puppet_install_script/shell_install.sh
103
103
  - test/unit/spec_helper.rb
104
104
  - test/unit/vagrant-puppet-install/config_spec.rb
105
105
  - vagrant-puppet-install.gemspec
@@ -134,7 +134,7 @@ test_files:
134
134
  - test/acceptance/rackspace/Vagrantfile
135
135
  - test/acceptance/virtualbox/Vagrantfile
136
136
  - test/support/manifests/base.pp
137
- - test/support/puppet_install_script/centos_6_x.sh
137
+ - test/support/puppet_install_script/shell_install.sh
138
138
  - test/unit/spec_helper.rb
139
139
  - test/unit/vagrant-puppet-install/config_spec.rb
140
140
  has_rdoc: