vagrant-pe_build 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd7aed48459e1704609d04c6530ba8ab70fd43a1
-  data.tar.gz: 994dcf14bf43b75f159dc45372d1b3900e736b6f
+  metadata.gz: 47561a70a1c02283bba9c70a97e051730f204fc4
+  data.tar.gz: 996f48ec7088af25312fecf60f7a1f841d541080
 SHA512:
-  metadata.gz: 6928c7749225819794f26be8265c0b52255827df2e44916c55e8189dd3b6bb46e49cb6d2b061c74a1ae17f30a97048cc93fd3f1151bc4437b683183ed103c036
-  data.tar.gz: 53faafebffffb6aec6053cf9ababe1ca5cce902620fe033085affeee9951a5d97a8f612f04e5db5b6d112b6d558f7a8381546196b9396ba61a54fa82f48670bb
+  metadata.gz: 9acee36342d28520e8fbc2266b7b1bfdc74bb8c52f59cb9ffcf5c11614a584c8ed1e34b0d077fd05d56e4253ebdc38e19a9c487e01f5bbe70804e8754c1900d6
+  data.tar.gz: d7c96302dc35a03ad6c08b7e63a62814c29c6338a161df39e73dcf3eedda49b4afc9feacc2c8f1585c4bbcf356755c61c4cf4d773b04421bc3626be76ebf1a2a

data/CHANGELOG

@@ -1,6 +1,30 @@
 vagrant-pe_build
 ================
 
+0.13.0
+------
+
+2015-10-18
+
+This is a backwards compatible feature release.
+
+  * Support for PE 2015.2.2.
+
+  * (GH-69), (GH-54) Added a new `pe_agent` provisioner which provides
+    fictionless agent installation for PE 2015.2.0 and newer. This provisioner
+    also supports orchestrating actions on the PE master VM, such as setting
+    up `pe_repo` to serve agent packages, signing agent certificates and
+    purging agent data when VMs are destroyed.
+
+  * (GH-99) Windows agents running PE 3.7.0 and newer are now installed from
+    64-bit packages if the underlying hardware supports it.
+
+  * (GH-91) New guest capability for retrieving VM facts using `puppet facts`.
+    A basic set of `architecture`, `os` and `release` facts is provided if
+    Puppet is not installed. There is a new command, `puppet pe-build facts`
+    for retrieving this data in JSON format, but the primary usecase is to
+    inform `pe_agent` decision-making.
+
 0.12.0
 ------
 

data/README.markdown

@@ -14,7 +14,7 @@ on Vagrant boxes to rapidly build a functioning Puppet environment.
 Vagrantfile Settings
 -------------------
 
-#### Config Namespace `config.pe_build`
+### Global `config.pe_build` Settings
 
 These settings go in the config object namespace and act as defaults in
 the event multiple machines are being provisioned. These settings are
@@ -42,11 +42,11 @@ optional and can be overridden in a VM's individual provisioner config.
       * file
       * A blank URI will default to `file`.
 
-#### Provisioner Namespace
+### `pe_bootstrap` Provisioner Settings
 
 These settings are on a per provisioner basis. They configure the individual
-behaviors of the provisioner. All of the `config.pe_build` options can be
-overridden at this point.
+behaviors of each provisioner instance. All of the `config.pe_build` options
+can be overridden at this point.
 
   * `role`
     * Description: The role of the Puppet Enterprise install.
@@ -78,113 +78,194 @@ overridden at this point.
     * Options: `true`, `false`
     * Default: `false`
 
+### `pe_agent` Provisioner Settings
+
+The `pe_agent` provisioner installs the Puppet Agent for PE 2015.2.0 and above
+and, optionally, configures PE Master VMs to support the new agent.
+
+
+**NOTE:** The `pe_agent` provisioner currently does not share any configuration
+with the global `config.pe_build` settings.
+
+  * `master_vm`
+    * Description: The name of a VM in the current Vagrant environment which
+      hosts the Puppet master that the agent should be connected to. When this
+      is set, the `master`, `autosign` and `autopurge` settings are populated
+      with default values. If the `master_vm` setting is not used, then the
+      `master` setting _must_ be populated with the hostname of the
+      Puppet Master.
+    * Default: `nil`.
+  * `autosign`
+    * Description: An boolean switch which controls whether or not to sign the
+      agent's certificate after installation. Requires `master_vm` to be set.
+    * Options: `true`, `false`
+    * Default: `true`, if `master_vm` is set.
+  * `autopurge`
+    * Description: An boolean switch which controls whether or not to clean the
+      agent's certificate from the master and purge agent data from PuppetDB
+      when the agent VM is destroyed. Requires `master_vm` to be set.
+    * Options: `true`, `false`
+    * Default: `true`, if `master_vm` is set.
+  * `master`
+    * Description: The hostname or fqdn of the puppet master. Must be specified
+      if `master_vm` is not set.
+    * Default: `nil`. Defaults to `vm.hostname` of the Puppet Master if
+      `master_vm` is set.
+  * `version`
+    * Description: The version number of the PE Agent to install. **NOTE:**
+      this setting is currently used only for Windows agents. POSIX agents will
+      always receive the `'current'` version installed on the master. Support
+      for setting the version number of POSIX agents will be added in a future
+      release.
+    * Options: A version string, `x.y.z[-optional-stuff]`, or the string
+      `'current'`.
+    * Default: `'current'`.
+
+
 Commands
 --------
 
 Usage Example
 -------------
 
-### Minimal configuration
+### Minimal PE 3.x configuration
 
 This requires that the necessary installers have already been downloaded and
 added with `vagrant pe-build copy`.
 
-    Vagrant.configure('2') do |config|
-      config.pe_build.version = '3.0.0'
+```ruby
+Vagrant.configure('2') do |config|
+  config.pe_build.version = '3.8.2'
+
+  config.vm.define 'master' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.role = :master
+    end
+  end
+
+  config.vm.define 'agent1' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.provision :pe_bootstrap
+  end
+end
+```
+
 
-      config.vm.define 'master' do |node|
-        node.vm.box = 'centos-6-i386'
+### Minimal PE 2015.x configuration
 
-        node.vm.provision :pe_bootstrap do |provisioner|
-          provisioner.role = :master
-        end
-      end
+Same as above, but uses `pe_agent` to provision agent nodes instead
+of `pe_bootstrap`.
 
-      config.vm.define 'agent1' do |node|
-        node.vm.box = 'centos-6-i386'
-        node.vm.provision :pe_bootstrap
-        end
-      end
+```ruby
+Vagrant.configure('2') do |config|
+  config.pe_build.version = '2015.2.2'
+
+  config.vm.define 'master' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+
+    node.vm.provision :pe_bootstrap do |p|
+      p.role = :master
     end
+  end
 
-### Specifying a download root
+  config.vm.define 'agent1' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'master'
+    end
+  end
+end
+```
 
-    Vagrant.configure('2') do |config|
-      config.pe_build.version = '3.0.0'
-      config.pe_build.download_root = 'http://my.pe.download.mirror/installers'
 
-      # Alternately, a local directory can be specified
-      #config.pe_build.download_root = 'file://Users/luke/Downloads'
+### Specifying a download root
 
-      config.vm.define 'master' do |node|
-        node.vm.box = 'centos-6-i386'
+```ruby
+Vagrant.configure('2') do |config|
+  config.pe_build.version = '3.8.2'
+  config.pe_build.download_root = 'http://my.pe.download.mirror/installers'
 
-        node.vm.provision :pe_bootstrap do |provisioner|
-          provisioner.role = :master
-        end
-      end
+  # Alternately, a local directory can be specified
+  #config.pe_build.download_root = 'file://Users/luke/Downloads'
 
-      config.vm.define 'agent1' do |node|
-        node.vm.box = 'centos-6-i386'
+  config.vm.define 'master' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
 
-        node.vm.provision :pe_bootstrap
-      end
+    node.vm.provision :pe_bootstrap do |p|
+      p.role = :master
     end
+  end
 
-### Using a manual answers file
+  config.vm.define 'agent1' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+
+    node.vm.provision :pe_bootstrap
+  end
+end
+```
 
-    Vagrant.configure('2') do |config|
-      config.pe_build.version = '3.0.0'
-      config.pe_build.download_root = 'http://my.pe.download.mirror/installers'
 
-      # Alternately, a local directory can be specified
-      #config.pe_build.download_root = 'file://Users/luke/Downloads'
+### Using a manual answers file
 
-      config.vm.define 'master' do |node|
-        node.vm.box = 'centos-6-i386'
+```ruby
+Vagrant.configure('2') do |config|
+  config.pe_build.version = '3.8.2'
+  config.pe_build.download_root = 'http://my.pe.download.mirror/installers'
 
-        node.vm.provision :pe_bootstrap do |provisioner|
-          provisioner.role = :master
-          provisioner.answer_file = 'answers/vagrant_master.answers.txt'
-        end
-      end
+  # Alternately, a local directory can be specified
+  #config.pe_build.download_root = 'file://Users/luke/Downloads'
 
-      config.vm.define 'agent1' do |node|
-        node.vm.box = 'centos-6-i386'
+  config.vm.define 'master' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
 
-        node.vm.provision :pe_bootstrap
-      end
+    node.vm.provision :pe_bootstrap do |p|
+      p.role = :master
+      p.answer_file = 'answers/vagrant_master.answers.txt'
     end
+  end
 
-### Manually setting a filename
+  config.vm.define 'agent1' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
 
-    Vagrant.configure('2') do |config|
-      config.pe_build.version  = '3.0.0'
-      config.pe_build.filename = 'puppet-enterprise-3.0.0-all.tar.gz'
+    node.vm.provision :pe_bootstrap
+  end
+end
+```
 
-      # Alternately, a local directory can be specified
-      #config.pe_build.download_root = 'file://Users/luke/Downloads'
 
-      config.vm.define 'master' do |node|
-        node.vm.box = 'centos-6-i386'
+### Manually setting a filename
+
+```ruby
+Vagrant.configure('2') do |config|
+  config.pe_build.version  = '3.8.2'
+  config.pe_build.filename = 'puppet-enterprise-3.8.2-el-7-x86_64.tar.gz'
 
-        node.vm.provision :pe_bootstrap do |provisioner|
-          provisioner.role = :master
-          provisioner.answer_file = 'answers/vagrant_master.answers.txt'
-        end
-      end
+  # Alternately, a local directory can be specified
+  #config.pe_build.download_root = 'file://Users/luke/Downloads'
 
-      config.vm.define 'agent1' do |node|
-        node.vm.box = 'centos-6-i386'
+  config.vm.define 'master' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
 
-        node.vm.provision :pe_bootstrap
-      end
+    node.vm.provision :pe_bootstrap do |p|
+      p.role = :master
     end
+  end
+
+  config.vm.define 'agent1' do |node|
+    node.vm.box = 'puppetlabs/centos-7.0-64-nocm'
+
+    node.vm.provision :pe_bootstrap
+  end
+end
+```
+
 
 Requirements
 ------------
 
-[vagranthosts]: https://github.com/adrienthebo/vagrant-hosts
+[vagranthosts]: https://github.com/oscar-stack/vagrant-hosts
 
 Ensure VMs have a FQDN set before installing PE. The easiest way to do this is by setting the `hostname` attribute of the VM configuration.
 
@@ -198,8 +279,8 @@ they have private network interfaces prepared.
 Contact
 -------
 
-  * [Source code](https://github.com/adrienthebo/vagrant-pe_build)
-  * [Issue tracker](https://github.com/adrienthebo/vagrant-pe_build/issues)
+  * [Source code](https://github.com/oscar-stack/vagrant-pe_build)
+  * [Issue tracker](https://github.com/oscar-stack/vagrant-pe_build/issues)
 
 If you have questions or concerns about this module, contact finch on on
 Freenode, or email adrien@puppetlabs.com.

data/acceptance/pe_build/pe_bootstrap_2015x_spec.rb

@@ -1,7 +1,7 @@
 shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
-  if !File.file?(options[:box])
+  if options[:boxes].empty?
     raise ArgumentError,
-      "A box file must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
+      "Box files must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
   end
 
   include_context 'acceptance'
@@ -17,7 +17,10 @@ shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
     # The skelton sets up a Vagrantfile which expects the OS under test to be
     # available as `box`.
     environment.skeleton('2015x_acceptance')
-    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
+    options[:boxes].each do |box|
+      name = File.basename(box).split('-').first
+      assert_execute('vagrant', 'box', 'add', name, box)
+    end
   end
 
   after(:each) do
@@ -25,21 +28,66 @@ shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
     assert_execute('vagrant', 'destroy', '--force', log: false)
   end
 
-  context 'when installing PE 2015.2.0' do
-    it 'provisions with pe_build' do
-      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-201520-master', 'pe-201520-agent')
-    end
-  end
+  # TODO: Refactor into a shared example so tha this testcase can be run on
+  # multiple versions.
+  context 'when installing PE 2015.2.x' do
+    it 'provisions masters with pe_bootstrap and agents with pe_agent' do
+      status('Test: pe_bootstrap master install')
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20152-master')
+
+      status('Test: pe_bootstrap master running after install')
+      result = execute('vagrant', 'ssh',
+        'pe-20152-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
+      expect(result).to exit_with(0)
+      expect(result.stdout).to match('"is_alive": true')
+
+      status('Test: pe_agent install')
+      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20152-agent')
+
+      status('Test: pe_agent signed cert during install')
+      result = execute('vagrant', 'ssh',
+        'pe-20152-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20152-agent.pe-bootstrap.vlan')
+      expect(result).to exit_with(0)
 
-  context 'when installing PE 2015.2.1' do
-    it 'provisions with pe_build' do
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-201521-master', 'pe-201521-agent')
+      status('Test: pe_agent cert purged when vm destroyed')
+      result = assert_execute('vagrant', 'destroy', '-f', 'pe-20152-agent')
+      result = execute('vagrant', 'ssh',
+        'pe-20152-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20152-agent.pe-bootstrap.vlan')
+      expect(result.stderr).to match(/Could not find a certificate/)
     end
   end
 
   context 'when installing PE 2015.latest' do
-    it 'provisions with pe_build' do
-      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2015latest-master', 'pe-2015latest-agent')
+    it 'provisions masters with pe_bootstrap and agents with pe_agent' do
+      status('Test: pe_bootstrap master install')
+      assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2015latest-master')
+
+      status('Test: pe_bootstrap master running after install')
+      result = execute('vagrant', 'ssh',
+        'pe-2015latest-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
+      expect(result).to exit_with(0)
+      expect(result.stdout).to match('"is_alive": true')
+
+      status('Test: pe_agent install')
+      result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2015latest-agent')
+
+      status('Test: pe_agent signed cert during install')
+      result = execute('vagrant', 'ssh',
+        'pe-2015latest-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2015latest-agent.pe-bootstrap.vlan')
+      expect(result).to exit_with(0)
+
+      status('Test: pe_agent cert purged when vm destroyed')
+      result = assert_execute('vagrant', 'destroy', '-f', 'pe-2015latest-agent')
+      result = execute('vagrant', 'ssh',
+        'pe-2015latest-master',
+        '-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2015latest-agent.pe-bootstrap.vlan')
+      expect(result.stderr).to match(/Could not find a certificate/)
     end
   end
+
 end

data/acceptance/pe_build/pe_bootstrap_3x_spec.rb

@@ -1,7 +1,7 @@
 shared_examples 'provider/provisioner/pe_bootstrap/3x' do |provider, options|
-  if !File.file?(options[:box])
+  if options[:boxes].empty?
     raise ArgumentError,
-      "A box file must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
+      "Box files must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
   end
 
   include_context 'acceptance'
@@ -17,7 +17,10 @@ shared_examples 'provider/provisioner/pe_bootstrap/3x' do |provider, options|
     # The skelton sets up a Vagrantfile which expects the OS under test to be
     # available as `box`.
     environment.skeleton('pe_build')
-    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
+    options[:boxes].each do |box|
+      name = File.basename(box).split('-').first
+      assert_execute('vagrant', 'box', 'add', name, box)
+    end
   end
 
   after(:each) do