puppetdb_foreman 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3ea822b096259679b0aac25ca37ca562f552abe
-  data.tar.gz: 64db6e9af941c5085eb51c24873f37b5bafc710a
+  metadata.gz: 4442df53231ba6c0098bfa2bc9773fada6549e61
+  data.tar.gz: 5fec4a311d6e1878d8c6a56bc33b9b84166bae15
 SHA512:
-  metadata.gz: 2ca16956c6343ceec6d612811fca6edbd88f3d62bdbbcaf9ef7c7bc483b24f0dd0f6e89a5deb22edbf4b76276683c95e705f53ced530aadcd230cadfa674c4d9
-  data.tar.gz: 7e6358c5f26ea6622d23ac698ee36246fdb2c5eb963ea3d8a8200acd2000b41afb84c863c2b476a46bb0ba35df95ca7749d80576170a3e18bbe1dbf0533ba2cf
+  metadata.gz: beb7c7e7ae56a366877ef6db40c4ca3863aabc1c429d8b38a7b312cd0690fbe01d19f85457b56bd23cb73501b8126658f66cff521ea3b2d1cbf0ed5da1905b32
+  data.tar.gz: 61744f43af61f238a8c6eb039c6816e82d11d7a998ccf81af79016ab4ed6a621cb40f640f9cabdf3f9e7ff73ba74ff12b99445bd521440cddfd06a30114910f0

data/app/models/puppetdb_foreman/host_extensions.rb

@@ -14,22 +14,47 @@ module PuppetdbForeman
             uri = URI.parse(Setting[:puppetdb_address])
             req = Net::HTTP::Post.new(uri.path)
             req['Accept'] = 'application/json'
-            req.body = 'payload={"command":"deactivate node","version":1,"payload":"\"'+name+'\""}'
+            req.content_type = 'application/json'
+
             res             = Net::HTTP.new(uri.host, uri.port)
             res.use_ssl     = uri.scheme == 'https'
             if res.use_ssl?
-              if Setting[:ssl_ca_file]
-                res.ca_file = Setting[:ssl_ca_file]
+              if Setting[:puppetdb_ssl_ca_file]
+                res.ca_file = Setting[:puppetdb_ssl_ca_file]
                 res.verify_mode = OpenSSL::SSL::VERIFY_PEER
               else
                 res.verify_mode = OpenSSL::SSL::VERIFY_NONE
               end
-              if Setting[:ssl_certificate] && Setting[:ssl_priv_key]
-                res.cert = OpenSSL::X509::Certificate.new(File.read(Setting[:ssl_certificate]))
-                res.key  = OpenSSL::PKey::RSA.new(File.read(Setting[:ssl_priv_key]), nil)
+              if Setting[:puppetdb_ssl_certificate] &&
+                Setting[:puppetdb_ssl_private_key]
+                res.cert = OpenSSL::X509::Certificate.new(
+                  File.read(Setting[:puppetdb_ssl_certificate]))
+                res.key  = OpenSSL::PKey::RSA.new(
+                  File.read(Setting[:puppetdb_ssl_private_key]), nil)
               end
+
+            end
+
+            if uri.path.start_with?("/pdb")
+              logger.debug "Using PuppetDB API v3"
+              req.body = {
+                 "command" => "deactivate node",
+                 "version" => 3,
+                 "payload" => {
+                   "certname" => name,
+                   "producer_timestamp" => "#{Time.now.iso8601}"
+                 }
+               }.to_json
+            else
+              logger.debug "Using PuppetDB API v1"
+              req.body = {
+                "command" => "deactivate node",
+                "version" => 1,
+                "payload" => name
+              }.to_json
             end
             res.start { |http| http.request(req) }
+
           rescue => e
             errors.add(:base, _("Could not deactivate host on PuppetDB: #{e}"))
           end

data/app/models/setting/puppetdb.rb

@@ -6,11 +6,17 @@ class Setting::Puppetdb < ::Setting
       default_enabled = SETTINGS[:puppetdb][:enabled]
       default_address = SETTINGS[:puppetdb][:address]
       default_dashboard_address = SETTINGS[:puppetdb][:dashboard_address]
+      default_ssl_ca_file= SETTINGS[:puppetdb][:ssl_ca_file]
+      default_ssl_certificate = SETTINGS[:puppetdb][:ssl_certificate]
+      default_ssl_private_key = SETTINGS[:puppetdb][:ssl_private_key]
     end
 
     default_enabled = false if default_enabled.nil?
-    default_address ||= 'https://puppetdb:8081/v2/commands'
-    default_dashboard_address ||= 'http://puppetdb:8080/dashboard'
+    default_address ||= 'https://puppetdb:8081/pdb/cmd/v1'
+    default_dashboard_address ||= 'http://puppetdb:8080/pdb/dashboard'
+    default_ssl_ca_file ||= "#{SETTINGS[:ssl_ca_file]}"
+    default_ssl_certificate ||= "#{SETTINGS[:ssl_certificate]}"
+    default_ssl_private_key ||= "#{SETTINGS[:ssl_priv_key]}"
 
     Setting.transaction do
       [
@@ -29,5 +35,23 @@ class Setting::Puppetdb < ::Setting
         self.set('puppetdb_dashboard_address', _('Foreman will proxy PuppetDB Performance Dashboard requests to this address'), default_dashboard_address)
       ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
     end
+
+    Setting.transaction do
+      [
+        self.set('puppetdb_ssl_ca_file', _('Foreman will send PuppetDB requests with this CA file'), default_ssl_ca_file)
+      ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
+    end
+
+    Setting.transaction do
+      [
+        self.set('puppetdb_ssl_certificate', _('Foreman will send PuppetDB requests with this certificate file'), default_ssl_certificate)
+      ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
+    end
+
+    Setting.transaction do
+      [
+        self.set('puppetdb_ssl_private_key', _('Foreman will send PuppetDB requests with this key file'), default_ssl_private_key)
+      ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
+    end
   end
 end

data/lib/puppetdb_foreman/version.rb

@@ -1,3 +1,3 @@
 module PuppetdbForeman
-  VERSION = '1.0.4'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: This is a Foreman plugin to interact with PuppetDB.