Merge remote-tracking branch 'upstream/stable'

Author: Michael Smith

acceptance/Gemfile

@@ -12,7 +12,7 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 2.27')
+gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 2.28')
 gem "rake", "~> 10.1"
 gem "httparty", :require => false
 gem 'uuidtools', :require => false

acceptance/config/aio/options.rb

@@ -8,6 +8,7 @@
     'setup/common/pre-suite/000-delete-puppet-when-none.rb',
     'setup/aio/pre-suite/010_Install.rb',
     'setup/aio/pre-suite/015_PackageHostsPresets.rb',
+    'setup/aio/pre-suite/020_InstallCumulusModules.rb',
     'setup/common/pre-suite/025_StopFirewall.rb',
     'setup/common/pre-suite/040_ValidateSignCert.rb',
     'setup/aio/pre-suite/045_EnsureMasterStartedOnPassenger.rb',

acceptance/config/nodes/cumulus-22-x86_64.yaml

@@ -0,0 +1,20 @@
+---
+HOSTS:
+  master:
+    roles:
+      - master
+    platform: el-7-x86_64
+    hypervisor: vcloud
+    template: redhat-7-x86_64
+  cumulus-22-x86_64:
+    roles:
+      - agent
+    platform: cumulus-2.2-amd64
+    hypervisor: none
+    ip: 10.0.77.5
+    vmhostname: dell-s6000.delivery.puppetlabs.net
+CONFIG:
+  datastore: instance0
+  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
+  folder: Delivery/Quality Assurance/FOSS/Dynamic
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/

acceptance/lib/puppet/acceptance/install_utils.rb

@@ -8,7 +8,7 @@ module Acceptance
     module InstallUtils
       PLATFORM_PATTERNS = {
         :redhat        => /fedora|el-|centos/,
-        :debian        => /debian|ubuntu/,
+        :debian        => /debian|ubuntu|cumulus/,
         :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
         :solaris_10    => /solaris-10/,
         :solaris_11    => /solaris-11/,
@@ -141,11 +141,15 @@ def install_repos_on(host, project, sha, repo_configs_dir)
           repo_url = "http://%s/%s/%s/repo_configs/rpm/%s" % [tld, project, sha, repo_filename]
 
           on host, "curl -o /etc/yum.repos.d/#{repo_filename} #{repo_url}"
-        when /^(debian|ubuntu)-([^-]+)-(.+)$/
+        when /^(debian|ubuntu|cumulus)-([^-]+)-(.+)$/
           variant = $1
           version = $2
           arch = $3
 
+          if variant =~ /cumulus/ then
+            version = variant
+          end
+
           list_filename = "pl-%s%s-%s.list" % [
             project,
             sha ? '-' + sha : '',

acceptance/setup/aio/pre-suite/020_InstallCumulusModules.rb

@@ -0,0 +1,12 @@
+platforms = hosts.map{|val| val[:platform]}
+skip_test "No cumulus hosts present" unless platforms.any? { |val| /cumulus/ =~ val }
+confine :to, {}, hosts.select { |host| host[:roles].include?('master') }
+
+step 'install Cumulus Modules on masters' do
+  hosts.each do |node|
+    on(node, puppet('module','install','cumuluslinux-cumulus_license'))
+    on(node, puppet('module','install','cumuluslinux-cumulus_interfaces'))
+    on(node, puppet('module','install','cumuluslinux-cumulus_interface_policy'))
+    on(node, puppet('module','install','cumuluslinux-cumulus_ports'))
+  end
+end

acceptance/tests/aix/aix_package_provider.rb

@@ -20,7 +20,7 @@ def assert_package_version(package, expected_version)
 
 teardown do
   on hosts, "rm -rf #{dir}"
-  on hosts, puppet('resource', 'package', "'#{package}' ensure=absent")
+  on hosts, "installp -u #{package}"
 end
 
 step "download packages to use for test"

lib/puppet/application/agent.rb

@@ -322,6 +322,9 @@ def run_command
       # waiting for certificates so that we don't block
       daemon = daemonize_process_when(Puppet[:daemonize])
 
+      # Setup signal traps immediately after daemonization so we clean up the daemon
+      daemon.set_signal_traps
+
       wait_for_certificates
 
       if Puppet[:onetime]
@@ -346,7 +349,6 @@ def fingerprint
   end
 
   def onetime(daemon)
-    daemon.set_signal_traps
     begin
       exitstatus = daemon.agent.run
     rescue => detail

lib/puppet/application/master.rb

@@ -295,6 +295,9 @@ def start_webrick_master
     daemon.server = Puppet::Network::Server.new(Puppet[:bindaddress], Puppet[:masterport])
     daemon.daemonize if Puppet[:daemonize]
 
+    # Setup signal traps immediately after daemonization so we clean up the daemon
+    daemon.set_signal_traps
+
     announce_start_of_master
 
     daemon.start

lib/puppet/daemon.rb

@@ -138,8 +138,6 @@ def stop(args = {:exit => true})
   end
 
   def start
-    set_signal_traps
-
     create_pidfile
 
     raise Puppet::DevError, "Daemons must have an agent, server, or both" unless agent or server

lib/puppet/provider/service/src.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 # AIX System Resource controller (SRC)
 Puppet::Type.type(:service).provide :src, :parent => :base do
 
@@ -63,6 +65,31 @@ def disable
     rmitab(@resource[:name])
   end
 
+  # Wait for the service to transition into the specified state before returning.
+  # This is necessary due to the asynchronous nature of AIX services.
+  # desired_state should either be :running or :stopped.
+  def wait(desired_state)
+    Timeout.timeout(60) do
+      loop do
+        status = self.status
+        break if status == desired_state.to_sym
+        sleep(1)
+      end
+    end
+  rescue Timeout::Error
+    raise Puppet::Error.new("Timed out waiting for #{@resource[:name]} to transition states")
+  end
+
+  def start
+    super
+    self.wait(:running)
+  end
+
+  def stop
+    super
+    self.wait(:stopped)
+  end
+
   def restart
       execute([command(:lssrc), "-Ss", @resource[:name]]).each_line do |line|
         args = line.split(":")

spec/unit/provider/service/src_spec.rb

@@ -37,7 +37,7 @@
   end
 
   describe ".instances" do
-    it "should has a .instances method" do
+    it "should have a .instances method" do
       expect(provider_class).to respond_to :instances
     end
 
@@ -63,15 +63,29 @@
   describe "when starting a service" do
     it "should execute the startsrc command" do
       @provider.expects(:execute).with(['/usr/bin/startsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
+      @provider.expects(:status).returns :running
       @provider.start
     end
+
+    it "should error if timeout occurs while stopping the service" do
+      @provider.expects(:execute).with(['/usr/bin/startsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
+      Timeout.expects(:timeout).with(60).raises(Timeout::Error)
+      expect { @provider.start }.to raise_error Puppet::Error, ('Timed out waiting for myservice to transition states')
+    end
   end
 
   describe "when stopping a service" do
     it "should execute the stopsrc command" do
       @provider.expects(:execute).with(['/usr/bin/stopsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
+      @provider.expects(:status).returns :stopped
       @provider.stop
     end
+
+    it "should error if timeout occurs while stopping the service" do
+      @provider.expects(:execute).with(['/usr/bin/stopsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
+      Timeout.expects(:timeout).with(60).raises(Timeout::Error)
+      expect { @provider.stop }.to raise_error Puppet::Error, ('Timed out waiting for myservice to transition states')
+    end
   end
 
   describe "should have a set of methods" do
@@ -160,14 +174,15 @@
       @provider.restart
     end
 
-    it "should execute restart which runs stopsrc then startsrc" do
+    it "should execute restart which runs stop then start" do
       sample_output =  <<_EOF_
 #subsysname:synonym:cmdargs:path:uid:auditid:standin:standout:standerr:action:multi:contact:svrkey:svrmtype:priority:signorm:sigforce:display:waittime:grpname:
 myservice::--no-daemonize:/usr/sbin/puppetd:0:0:/dev/null:/var/log/puppet.log:/var/log/puppet.log:-O:-Q:-S:0:0:20:15:9:-d:20::"
 _EOF_
+
       @provider.expects(:execute).with(['/usr/bin/lssrc', '-Ss', "myservice"]).returns sample_output
-      @provider.expects(:execute).with(['/usr/bin/stopsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
-      @provider.expects(:execute).with(['/usr/bin/startsrc', '-s', "myservice"], {:override_locale => false, :squelch => false, :combine => true, :failonfail => true})
+      @provider.expects(:stop)
+      @provider.expects(:start)
       @provider.restart
     end
   end