master_manipulator 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI5NWY1NDIzOTg4YmU4ZTg5ODNiZTM2YTAxOThiODZmYmM3ZGQ2ZA==
+    MWJiNDE5ZWJjNDlhNTBlYWU3ZGQ2ODc0N2UxMzM0MzQ5OGY4Zjk1MQ==
   data.tar.gz: !binary |-
-    Nzg2ZGRlMWQxMjQ1OTdmMDI5YzJiNjMzNmNmZjI1OGYzMDlkNTVhZg==
+    NGEyZWM4YmI0Nzk0MGMxYzA1YmEzMWFmOGZiODE3ZTJhNDIzYjRiNg==
 SHA512:
   metadata.gz: !binary |-
-    NGYxZDYzZjRhMGU2MmIxZWRiODRhYzhjYTlkMWY0NTc3ZjljNGI3Yjc5YzE4
-    NDc5MWQzNzFlMTI1MTY5NzIzMTRlMWViOTk4ZmZhYmE5YjVlMjE3N2JhZjE0
-    MTk3N2U5ZTcyZmNjYWQxOTYyMGQxYzc4MDBkM2UzMDMwOGNjMWI=
+    OWY3MmNhMjEzNDk5N2QxYjM1YWExNzZiYzY2YzJmYzhhNTBhMDNmOTg0OTI3
+    MjM0YjU4ZmI2M2U1NWRlMGI4OGUwZWFlMjllMWRjZTdhZjRiZTQzNTA4Mjlk
+    ZWZiN2UxOGEwZDU4NmU1ODQ4Mzk0MmNlMDY2YzE2NDVjNDdhZTM=
   data.tar.gz: !binary |-
-    NTA1YmMwNjVmMjVjZGQzYzc3NGUwMjAxZTU3NGFmZjY4ZjVmNmRhMWQ5ZGZm
-    Yzc4NzRlOGYyYzhlMDFmZWUwMDVkYzkyZWJjNzE1Y2FiNjJlN2EyYjdkZjA4
-    NjYwZjZlMDBkN2IxMWIwYWI5YWRiZGFkZTU2NmQ3YmRjOTc4NmU=
+    Njk4MmMzNDJkNzJjMDY4YzI0MWE5ZWY3OWNhNDBhM2EwOTdlYTI3NmY2M2E3
+    ZGQ3NmVmYTdmMWUyNTkyODc4NDUxNmY1ZTI2ZGI2ZTQ1ZTZjOWI0MGEwMjgy
+    NjdhYzY0MzMxMjk4YTBmMzI3MTAxZjEwN2M5ZThjYzM2Mjk3MTY=

data/lib/master_manipulator/log.rb

@@ -8,8 +8,10 @@ module MasterManipulator
     # @example return the path to the puppet server log file
     #   puppet_server_log_path(master)
     def puppet_server_log_path(master_host)
-      log_dir = on(master_host, puppet("master --configprint logdir")).stdout.chomp
-      "#{log_dir}/puppetserver.log"
+      # we use the "puppet config print logdir" to build the path, because "puppet master --configprint logdir" is
+      # set to the the puppet agent directory instead of the puppetserver, on some of the PE tests so we can't use it
+      log_dir = on(master_host, puppet("config print logdir")).stdout.chomp
+      "#{log_dir}server/puppetserver.log"
     end
 
     #<fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>

data/lib/master_manipulator/version.rb

@@ -1,5 +1,5 @@
 module MasterManipulator
   module Version
-    STRING = '2.1.0'
+    STRING = '2.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: master_manipulator
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler