beaker-puppet_install_helper 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3ab1391c840c72e0a1e79bf939dcbfbdf58869a
-  data.tar.gz: f4c3d416e7647511608663e7e3fe84540eee0ab8
+  metadata.gz: 8131d15e7ced64bf1aa8ca7ea41f81364282778f
+  data.tar.gz: 56f041ee7891f7e5d35a50634ef6de2d75122267
 SHA512:
-  metadata.gz: 21987dff0ba3291aa3a1e81cc5a94e076ba08c62c387ba0ac5c4fea2cc5484719d7489c3ae3b881a4d519cf1f1758b3847fba5df0c6d8f5c8e839b93cda02000
-  data.tar.gz: 8b6c6cd2b7c4d31e6853a8f0454990bb3d56166e6261297e28b76a79d745f5d05b0098e4014b2f72f3b99f5c77c3dc3c3a312429d1e00c06367021a6ea0c624e
+  metadata.gz: 4a00f8327123a968bb98cb2fe4d313694a2d290841ebc0cc4d0cfaa80732190a288060d2949bf8b7d93fb359d3f4005eff2732e4e79d04dddba331e3b2da90ca
+  data.tar.gz: 5533d94d243a3f7d0dfc48528a63141aae8a6ca75add65f154627217102284628e470831e0ea444bd98cd7de7d940347445a937dfe3887ddd58d106b55080992

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.7.0]
+### Changed
+- MODULES-4653 `run_puppet_install_helper_on` now installs puppetserver on master role when using the `foss` install type.
+
+### Fixed
+- Add puppet bin folder to $PATH on non-windows
+
 ## [0.6.0]
 ### Changed
 - Change the default `PUPPET_INSTALL_TYPE` to `agent`
@@ -32,6 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Add solaris for installing CA certs as well.
 
+[0.7.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.6.0...0.7.0
 [0.6.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.5.0...0.6.0
 [0.5.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.4.4...0.5.0
 [0.4.4]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.4.3...0.4.4

data/README.md

@@ -12,6 +12,7 @@ The way to use this is to declare either `run_puppet_install_helper()` or `run_p
 - `PUPPET_INSTALL_TYPE=foss` will read `PUPPET_INSTALL_VERSION` and:
   - if `PUPPET_INSTALL_VERSION` is less than 4 will attempt to install that version of the system package if available, or else the ruby gem of that version.
   - if `PUPPET_INSTALL_VERSION` is 4 or more it will attempt to install the corresponding puppet-agent package, or gem version otherwise.
+  - if a `master` role is defined, will install puppetserver on that node. Note that the corresponding puppet-agent dependency will be installed on that node rather than the specified `PUPPET_INSTALL_VERSION`.
 
 The best way is explicitly set `PUPPET_INSTALL_TYPE` and `PUPPET_INSTALL_VERSION` to what you want. It'll probably do what you expect.
 

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'beaker-puppet_install_helper'
-  s.version     = '0.6.0'
+  s.version     = '0.7.0'
   s.authors     = ['Puppetlabs']
   s.email       = ['hunter@puppet.com']
   s.homepage    = 'https://github.com/puppetlabs/beaker-puppet_install_helper'

data/lib/beaker/puppet_install_helper.rb

@@ -51,8 +51,25 @@ module Beaker::PuppetInstallHelper
     when 'foss'
       opts = options.merge(version: version,
                            default_action: 'gem_install')
-
-      install_puppet_on(hosts, opts)
+      hosts.each do |host|
+        if hosts_with_role(hosts, 'master').length>0 then
+          next if host == master
+        end
+        install_puppet_on(host, opts)
+      end
+      if hosts_with_role(hosts, 'master').length>0 then
+        # install puppetserver
+        install_puppetlabs_release_repo( master, 'pc1' )
+        master.install_package('puppetserver')
+        on(master, puppet('resource', 'service', 'puppetserver', 'ensure=running'))
+        agents.each do |agent|
+          on(agent, puppet('resource', 'host', 'puppet', 'ensure=present', "ip=#{master.get_ip}"))
+          on(agent, puppet('agent', '--test'), :acceptable_exit_codes => [0,1])
+        end
+        master['distmoduledir'] = on(master, puppet('config', 'print', 'modulepath')).stdout.split(':')[0]
+        sign_certificate_for(agents)
+        run_agent_on(agents)
+      end
       # XXX install_puppet_on() will only add_aio_defaults_on when the nodeset
       # type == 'aio', but we don't want to depend on that.
       if opts[:version] && !version_is_less(opts[:version], '4.0.0')
@@ -60,6 +77,9 @@ module Beaker::PuppetInstallHelper
         add_puppet_paths_on(hosts)
       end
       Array(hosts).each do |host|
+        if hosts_with_role(hosts, 'master').length>0 then
+          next if host == master
+        end
         if fact_on(host, 'osfamily') != 'windows'
           on host, "mkdir -p #{host['distmoduledir']}"
           # XXX Maybe this can just be removed? What PE/puppet version needs
@@ -88,6 +108,12 @@ module Beaker::PuppetInstallHelper
       # nodeset type == 'aio', but we don't want to depend on that.
       add_aio_defaults_on(hosts)
       add_puppet_paths_on(hosts)
+      # beaker does not add the puppet bin folder to $PATH. this adds it for puppet 4
+      Array(hosts).each do |host|
+        if fact_on(host, 'osfamily') != 'windows'
+          on host, "echo 'export PATH=/opt/puppetlabs/puppet/bin:${PATH}' >> /root/.bashrc"
+        end
+      end
     else
       raise ArgumentError, "Type must be pe, foss, or agent; got #{type.inspect}"
     end

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -10,10 +10,12 @@ describe 'Beaker::PuppetInstallHelper' do
     allow(foss_host).to receive(:[]).with('distmoduledir').and_return('/dne')
     allow(foss_host).to receive(:[]).with('platform').and_return('Debian')
     allow(foss_host).to receive(:[]).with('pe_ver').and_return(nil)
+    allow(foss_host).to receive(:[]).with('roles').and_return(['agent'])
     allow(foss_host).to receive(:puppet).and_return('hiera_config' => '/dne')
     allow(pe_host).to receive(:[]).with('pe_ver').and_return('3.8.3')
     allow(pe_host).to receive(:[]).with('distmoduledir').and_return('/dne')
     allow(pe_host).to receive(:[]).with('platform').and_return('Debian')
+    allow(pe_host).to receive(:[]).with('roles').and_return(['agent'])
     allow(pe_host).to receive(:puppet).and_return('hiera_config' => '/dne')
     [foss_host, pe_host]
   end
@@ -21,6 +23,7 @@ describe 'Beaker::PuppetInstallHelper' do
     allow(subject).to receive(:options).and_return({})
     allow(subject).to receive(:on)
     allow(subject).to receive(:fact_on)
+    allow(subject).to receive(:agents).and_return(hosts)
   end
   after :each do
     ENV.delete('PUPPET_VERSION')
@@ -71,22 +74,56 @@ describe 'Beaker::PuppetInstallHelper' do
       end
     end
     context 'for foss' do
+      let :hosts do
+        foss_host = double(is_pe?: false)
+        foss_master = double(is_pe?: false)
+        allow(foss_host).to receive(:[]).with('distmoduledir').and_return('/dne')
+        allow(foss_host).to receive(:[]).with('platform').and_return('Debian')
+        allow(foss_host).to receive(:[]).with('pe_ver').and_return(nil)
+        allow(foss_host).to receive(:[]).with('roles').and_return(['agent'])
+        allow(foss_host).to receive(:puppet).and_return('hiera_config' => '/dne')
+        allow(foss_master).to receive(:[]).with('pe_ver').and_return(nil)
+        allow(foss_master).to receive(:[]=).with('distmoduledir', 'foo')
+        allow(foss_master).to receive(:[]).with('platform').and_return('Debian')
+        allow(foss_master).to receive(:[]).with('roles').and_return(['master'])
+        allow(foss_master).to receive(:get_ip).and_return('1.2.3.4')
+        allow(foss_master).to receive(:install_package).with('puppetserver')
+        allow(foss_master).to receive(:get_ip).and_return('1.2.3.4')
+        [foss_host, foss_master]
+      end
+      let :result do
+        Beaker::Result.new( nil, nil )
+      end
+      before :each do
+        allow(subject).to receive(:master).and_return(hosts[1])
+        allow(subject).to receive(:sign_certificate_for)
+        allow(subject).to receive(:puppet_agent)
+        allow(subject).to receive(:puppet).with('resource', 'service', 'puppetserver', 'ensure=running')
+        allow(subject).to receive(:puppet).with('resource', 'host', 'puppet', 'ensure=present', 'ip=1.2.3.4')
+        allow(subject).to receive(:puppet).with('agent', '--test')
+        allow(subject).to receive(:puppet).with('config', 'print', 'modulepath')
+        allow(subject).to receive(:on).and_return(result)
+        result.stdout = 'foo:bar'
+      end
       it 'uses foss explicitly' do
         ENV['PUPPET_INSTALL_TYPE'] = 'foss'
-        expect(subject).to receive(:install_puppet_on).with(hosts, version: nil, default_action: 'gem_install')
+        expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
+        expect(subject).to receive(:install_puppet_on).with(hosts[0], version: nil, default_action: 'gem_install')
         subject.run_puppet_install_helper_on(hosts)
       end
       %w(PUPPET_VERSION PUPPET_INSTALL_VERSION).each do |version_var|
         it 'uses foss with a version' do
           ENV['PUPPET_INSTALL_TYPE'] = 'foss'
           ENV[version_var] = '3.8.1'
-          expect(subject).to receive(:install_puppet_on).with(hosts, version: '3.8.1', default_action: 'gem_install')
+          expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
+          expect(subject).to receive(:install_puppet_on).with(hosts[0], version: '3.8.1', default_action: 'gem_install')
           subject.run_puppet_install_helper_on(hosts)
         end
         it 'uses foss with a >4 version detects AIO' do
           ENV['PUPPET_INSTALL_TYPE'] = 'foss'
           ENV[version_var] = '4.1.0'
-          expect(subject).to receive(:install_puppet_on).with(hosts, version: '4.1.0', default_action: 'gem_install')
+          expect(subject).to receive(:install_puppetlabs_release_repo).with(hosts[1], 'pc1')
+          expect(subject).to receive(:install_puppet_on).with(hosts[0], version: '4.1.0', default_action: 'gem_install')
           expect(subject).to receive(:add_aio_defaults_on).with(hosts)
           expect(subject).to receive(:add_puppet_paths_on).with(hosts)
           subject.run_puppet_install_helper_on(hosts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec