beaker-pe 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDdmODU1MjE4MDIwZjBkYjUyMWZkYTU3OWI3MzU0ZjFkMmQyZGRkMw==
+    OWZjMjMxMzZmYjc5ZWYzN2NiYmYwYmY2YzUyOWM3ZGM2YTZiZWI5MA==
   data.tar.gz: !binary |-
-    NzA3N2NiMzAxNjdlODA1ZmIwZTg1MThmZmFmMDFjZmViNmZkMDJjMw==
+    YzAwOTlhOGJhMmUzYWU1Nzg0Y2RmOWNkNGY4MWU3YjlkM2Q0ZTE5OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDc1ZWVjMDg0MWJjYTBkZTNkM2Y3ODIzMTU3NTg5ZmMyMzc1OTRmOTVkMzMx
-    NWE4ZTc5MTM5YjM1NTljMTZhMmM3ZmJlMTExNWViMDhkNTdiZGUwZTQwNjA2
-    ZTZiYmIzNjJhZmRhM2I4ZWQzYmIyNDhiZjkzOTgzYTIwMzc2Njk=
+    ZGZhOTYzNzE3MDY2YzUxNTU4ODg4ZWJkM2U4NDFkYmRjYTk3ODNjODA5OTRj
+    MzM3ZGM4ODI5OWEyOTRmYjNkNTEzZmFlYTU5M2M5OTZmNTc0ZDYzZDYzZDQz
+    MjY5YTZmNDA5ZDNiZTdjZDA5MzAyZWUxNTJjMDJlYTQyYTk4MjQ=
   data.tar.gz: !binary |-
-    N2EyZTkwYTc4MTYxZWZkMDUyZjI4Zjg5ODQxYzgxZTljZjU2Y2VhZWFlZjUw
-    MjZiMDFiMDRiMWE2ZjE5ODIwMzYyMzM5ODUxY2UyZDQ3MDEyZTVhYmUxYjFh
-    MDQ0OGVmMzg2NWQxODk2ZWM4ZTI1ZmQ4MzkyYjA5ODVjMWFiMDU=
+    MTUzMzMwNzc3MzFiOTAzMzM1MDlkOWEyZTQ3NGYwNmQ3Y2JiNjNjMjE4YzNk
+    ZWY0MjljM2QyYTQ3OTUxMWQzMTk5N2M1MTEzOTI4ZjZhYjE4YmE4MzNjYzYx
+    MzVkZjdiYTlkYjgwNWMxNzAzNDQyZDkwMzA1NGM4NzZlMGQ5YjU=

data/HISTORY.md

@@ -1,10 +1,38 @@
 # default - History
 ## Tags
-* [LATEST - 4 Apr, 2016 (6ccb5a59)](#LATEST)
+* [LATEST - 4 Apr, 2016 (b3175863)](#LATEST)
+* [0.1.1 - 4 Apr, 2016 (8203d928)](#0.1.1)
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 4 Apr, 2016 (6ccb5a59)
+### <a name = "LATEST">LATEST - 4 Apr, 2016 (b3175863)
+
+* (GEM) update beaker-pe version to 0.1.2 (b3175863)
+
+* Merge pull request #3 from demophoon/fix/master/pe-14934-robust-puppetdb-check (c3bebe59)
+
+
+```
+Merge pull request #3 from demophoon/fix/master/pe-14934-robust-puppetdb-check
+
+(PE-14934) Add more robust puppetdb check
+```
+* (PE-14934) Add more robust puppetdb check (7112971a)
+
+
+```
+(PE-14934) Add more robust puppetdb check
+
+Before this commit we were still failing before the last puppet agent
+run in do_install because we also run puppet agent in some cases before
+the last run. This commit adds in the wait during that agent run as well
+as a check on the status endpoint in puppetdb to be sure that it is
+running in the case that the port is open but puppetdb is not ready for
+requests.
+```
+### <a name = "0.1.1">0.1.1 - 4 Apr, 2016 (8203d928)
+
+* (HISTORY) update beaker-pe history for gem release 0.1.1 (8203d928)
 
 * (GEM) update beaker-pe version to 0.1.1 (6ccb5a59)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -2,6 +2,7 @@
     require "beaker/dsl/install_utils/#{lib}"
 end
 require "beaker-answers"
+require "timeout"
 module Beaker
   module DSL
     module InstallUtils
@@ -443,17 +444,20 @@ module Beaker
             # Wait for PuppetDB to be totally up and running (post 3.0 version of pe only)
             sleep_until_puppetdb_started(database) unless pre30database
 
-            # Run the agent once to ensure everything is in the dashboard
-            install_hosts.each do |host|
-              on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
-
-              # Workaround for PE-1105 when deploying 3.0.0
-              # The installer did not respect our database host answers in 3.0.0,
-              # and would cause puppetdb to be bounced by the agent run. By sleeping
-              # again here, we ensure that if that bounce happens during an upgrade
-              # test we won't fail early in the install process.
-              if host['pe_ver'] == '3.0.0' and host == database
-                sleep_until_puppetdb_started(database)
+            step "First puppet agent run" do
+              # Run the agent once to ensure everything is in the dashboard
+              install_hosts.each do |host|
+                on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
+
+                # Workaround for PE-1105 when deploying 3.0.0
+                # The installer did not respect our database host answers in 3.0.0,
+                # and would cause puppetdb to be bounced by the agent run. By sleeping
+                # again here, we ensure that if that bounce happens during an upgrade
+                # test we won't fail early in the install process.
+                if host == database && ! pre30database
+                  sleep_until_puppetdb_started(database)
+                  check_puppetdb_status_endpoint(database)
+                end
               end
             end
 
@@ -471,15 +475,18 @@ module Beaker
               on dashboard, "/opt/puppet/bin/rake -sf /opt/puppet/share/puppet-dashboard/Rakefile #{task} RAILS_ENV=production"
             end
 
-            # Now that all hosts are in the dashbaord, run puppet one more
-            # time to configure mcollective
-            install_hosts.each do |host|
-              on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
-              # To work around PE-14318 if we just ran puppet agent on the
-              # database node we will need to wait until puppetdb is up and
-              # running before continuing
-              if host == database
-                sleep_until_puppetdb_started(database)
+            step "Final puppet agent run" do
+              # Now that all hosts are in the dashbaord, run puppet one more
+              # time to configure mcollective
+              install_hosts.each do |host|
+                on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
+                # To work around PE-14318 if we just ran puppet agent on the
+                # database node we will need to wait until puppetdb is up and
+                # running before continuing
+                if host == database && ! pre30database
+                  sleep_until_puppetdb_started(database)
+                  check_puppetdb_status_endpoint(database)
+                end
               end
             end
           end
@@ -540,6 +547,22 @@ module Beaker
           install_pe_on(hosts, options)
         end
 
+        def check_puppetdb_status_endpoint(host)
+          if version_is_less(host['pe_ver'], '2016.1.0')
+            return true
+          end
+          Timeout.timeout(60) do
+            match = nil
+            while not match
+              output = on(host, "curl -s http://localhost:8080/pdb/meta/v1/version", :accept_all_exit_codes => true)
+              match = output.stdout =~ /version.*\d+\.\d+\.\d+/
+              sleep 1
+            end
+          end
+        rescue Timeout::Error
+          fail_test "PuppetDB took too long to start"
+        end
+
         #Install PE based upon host configuration and options
         #
         # @param [Host, Array<Host>] install_hosts    One or more hosts to act upon

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.1.1'
+        STRING = '0.1.2'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec