master_manipulator 1.2.2 → 1.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzAyZWVhZGE1MDE3NmJkNDU3MGNjMzE5NTBhNzA5YTEyOWIxYjk4Mg==
+    ZDJkYTZhZTY4Y2JjMjZlM2JlNWZhMmU4YWEwNzkwM2E2NzE3OWEzYw==
   data.tar.gz: !binary |-
-    NjYyZjRiODNhNGU3YWRkNGE5ZmMwOWEwY2ZhNGJiOTQxZWUyYmQyMg==
+    ZDZkMzI5MjdiMTVlNGVkZmU2NDY4Zjk2MDhlNDIzMDJkNmIzODRmZA==
 SHA512:
   metadata.gz: !binary |-
-    ZjkyN2NkNDViOGYwMmFlMWVmYjNmNGNmMzA3ZGIzOGQ3MDUzM2UyOTZkYjE2
-    ODZlYzQyYzk0MWYyMmUxYTYyMjM3Y2U1MzgxMDcwMjBlNTk5ZTZjZTEyNjI4
-    ZTUwNDA5NDdjNmMyZGU3ZWM3ZmMzZjM4MWNkZTc0MTQwZTI2NWM=
+    NjY3NDBjZjU2ZjkzZjc0YjkxMDhiNDU0Nzg2MjA2NGJiNjRlYjRmODAwY2Q5
+    ZmZiMzFhNzNmZjdlZTE5MWYzNjExODMxNzQ2ZGJkN2Y0MWEyZTIyYWU1NzM3
+    YWJkZjk0ZTI3ZTM5NjhlNDE4ODMxZGE2MDkyZGMwMmRmNjQzM2Q=
   data.tar.gz: !binary |-
-    YzcwNzcyYjNiMzYxMzYzNWM4M2VhM2VjNTY3NmU1YWE0OTgyMjU1ZjJhZDAz
-    YTU0NzI3YjIxMmViNjc3NjNjMzlmMTkxYjk4NThjZTVhOWQ2ZTlkZmM1Y2Jm
-    N2MxNGE3NTBmODJjNGRkNGFjNTE3MTk2OTVmMDRiZWY2M2Q0M2U=
+    MmM3ODdlMTQyYmIxMzRhNTNjYWNiZGY0YjBlOTllNjVlMTVmNWEwZmE3OGQ3
+    YjY5NmE2ZjNhMDgwNWY3MzEwN2UyMjU5ZmRiNTRlYjE4ZTA1ZmQzMTcyNDhi
+    YWU3ZDZkZDVkZTQxYTczYWIzOTUwNGEyMjkyN2EyMTBlYzA0NmY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    master_manipulator (1.2.2)
+    master_manipulator (1.2.3)
       beaker (~> 2.7, >= 2.7.0)
       multi_json
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.2)
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -25,13 +25,13 @@ GEM
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (2.27.0)
+    beaker (2.29.0)
       aws-sdk (~> 1.57)
       beaker-answers (~> 0.0)
       beaker-hiera (~> 0.0)
       docker-api
       fission (~> 0.4)
-      fog (~> 1.25)
+      fog (~> 1.25, < 1.35.0)
       fog-google (~> 0.0.9)
       google-api-client (~> 0.8)
       hocon (~> 0.1)
@@ -45,7 +45,7 @@ GEM
       rsync (~> 1.0.9)
       stringify-hash (~> 0.0)
       unf (~> 0.1)
-    beaker-answers (0.3.0)
+    beaker-answers (0.3.2)
       require_all (~> 1.3.2)
       stringify-hash (~> 0.0.0)
     beaker-hiera (0.1.1)
@@ -54,7 +54,7 @@ GEM
     coderay (1.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.22.4)
+    docker-api (1.23.0)
       excon (>= 0.38.0)
       json
     excon (0.45.4)
@@ -99,13 +99,11 @@ GEM
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.32.1)
+    fog-core (1.34.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
       mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
     fog-dynect (0.0.2)
       fog-core
       fog-json
@@ -138,13 +136,13 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.3.3)
+    fog-sakuracloud (1.4.0)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.0.1)
+    fog-softlayer (1.0.2)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -204,13 +202,13 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.8.2)
+    minitest (5.8.3)
     multi_json (1.11.2)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     open_uri_redirections (0.2.1)
     props (1.1.2)
@@ -225,19 +223,19 @@ GEM
       trollop
     require_all (1.3.3)
     retriable (1.4.1)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     rsync (1.0.9)
     rubyzip (1.1.7)
     signet (0.6.1)

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 30 Oct, 2015 (58720b61)](#LATEST)
+* [LATEST - 20 Nov, 2015 (b37806b8)](#LATEST)
+* [1.2.2 - 30 Oct, 2015 (31450d3c)](#1.2.2)
 * [1.2.1 - 30 Oct, 2015 (b59fd2cf)](#1.2.1)
 * [1.2.0 - 29 Oct, 2015 (6d0873f7)](#1.2.0)
 * [1.1.2 - 14 Jul, 2015 (13e5bb62)](#1.1.2)
@@ -10,7 +11,27 @@
 * [1.0.0 - 6 May, 2015 (8ae50d90)](#1.0.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 30 Oct, 2015 (58720b61)
+### <a name = "LATEST">LATEST - 20 Nov, 2015 (b37806b8)
+
+* (GEM) update master_manipulator version to 1.2.3 (b37806b8)
+
+* Merge pull request #16 from zreichert/make_master_manipulator_3.8_compatible (9d2073ff)
+
+
+```
+Merge pull request #16 from zreichert/make_master_manipulator_3.8_compatible
+
+(QA-2182) make restart_puppet_server 3.8 compatible
+```
+* Address comments and fix spec tests (96d82bd4)
+
+* add method for determining pe_version (c2b9a957)
+
+* (QA-2182) make restart_puppet_server 3.8 compatible (9444b681)
+
+### <a name = "1.2.2">1.2.2 - 30 Oct, 2015 (31450d3c)
+
+* (HISTORY) update master_manipulator history for gem release 1.2.2 (31450d3c)
 
 * (GEM) update master_manipulator version to 1.2.2 (58720b61)
 

data/lib/master_manipulator/service.rb

@@ -27,16 +27,28 @@ module MasterManipulator
       hostname = on(host, 'hostname').stdout.chomp
       opts[:wait_cycles] ||= 10
 
-      # -k to ignore HTTPS error that isn't relevant to us
-      curl_call = "-k -X GET -H 'Content-Type: application/json' https://#{hostname}:8140/status/v1/services?level=debug"
+      pe_ver = pe_version(host)
+      three_eight_regex = /^3\.8/
+
+      # This logic is not ideal refactor in the future
+      # if its PE and not 3.8 use the status endpoint
+      # it its not PE or it is 3.8 use the simple curl call
+      if pe_ver && !pe_ver.match(three_eight_regex)
+        curl_call = "-k -X GET -H 'Content-Type: application/json' https://#{hostname}:8140/status/v1/services?level=debug"
+      else
+        curl_call = "-I -k https://#{hostname}:8140"
+      end
 
       (1..opts[:wait_cycles]).each do |i|
+
         @result = curl_on(host, curl_call, :acceptable_exit_codes => [0,1,7])
-        @body = JSON.parse(@result.stdout)
+        # parse body if we are using PE and we are not in PE 3.8
+        (pe_ver && !pe_ver.match(three_eight_regex)) ? @body = JSON.parse(@result.stdout) : @body = []
+
         case @result.exit_code.to_s
           when '0'
             sleep 20
-            return if @body.all?{ |k, v| v['state'] == 'running' }
+            pe_ver.match(/three_eight_regex/) ? return : (return if @body.all? { |k, v| v['state'] == 'running' })
           when '1', '7'
             # Exit code 7 is "connection refused"
             sleep (i**(1.2))
@@ -57,5 +69,27 @@ module MasterManipulator
 
     end
 
+    # Determine the version of PE installed on the master
+    #
+    # ==== Attributes
+    # *+host+ - the host that this should operate on
+    #
+    # ==== Returns
+    #
+    # +string+ -The version of puppet enterprise, if version can not be determined 'version unknown' is returned
+    #
+    # ==== Examples
+    #
+    # pe_version
+    def pe_version(host)
+      if on(host, 'test -f /opt/puppet/pe_version', :acceptable_exit_codes => [0,1]).exit_code == 0
+        return on(host, 'cat /opt/puppet/pe_version').stdout.chomp
+      elsif on(host, 'test -f /opt/puppetlabs/server/pe_version', :acceptable_exit_codes => [0,1]).exit_code == 0
+        return on(host, 'cat /opt/puppetlabs/server/pe_version').stdout.chomp
+      else
+        return 'version unknown'
+      end
+    end
+
   end
 end

data/lib/master_manipulator/version.rb

@@ -1,5 +1,5 @@
 module MasterManipulator
   module Version
-    STRING = '1.2.2'
+    STRING = '1.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: master_manipulator
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler