puppetdb_foreman 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDJmZTBhM2Q1YTc2Zjg5ZjU4YjMwZGNiYzE0OTE0NjY3ZTMzMmMxZQ==
+  data.tar.gz: !binary |-
+    NmZlNTY3OWQ3MzI2ZDRjNDI1ZjI2NTZjYmI1M2VhYTRkODliMGU3MQ==
+SHA512:
+  metadata.gz: !binary |-
+    NTVkMmVmMmZkMjJmZGRmNDYyNDZmMmI5M2ExYTZhMjg3MDAxYWFkNDEzYTA1
+    NzEwZTdjMTQ0MTEzNjJjMjNlOWViYzExY2FjYmVkNWNjMDFkZmQ1OTY5MjM5
+    MzNiZGI5NzcwMjQ2NDc1ODkxMGQ1N2EwZjJkN2JjNTY0NzYxYmI=
+  data.tar.gz: !binary |-
+    ZTZmMzhmZjE3Zjk0N2RlYjZjMGE2OGZiZjI1NmIxM2Q3Y2Y1YTJlNjUyZTc0
+    ZjNjOTU4ZmY0YzdlNzg4MWY0YjkxYWJmYzUzOWQwOTgwMDQzNTYyZjI4NTNk
+    MzE1OTk0NDJmOTZjNTRjMTgwZGU2ZDE1YzJjMDQ5OWQzODBlOWY=

data/app/models/puppetdb_foreman/host_extensions.rb

@@ -1,36 +1,64 @@
+#
+# Copyright 2013 CERN, Switzerland
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 module PuppetdbForeman
-  module HostExtensions 
+  module HostExtensions
     extend ActiveSupport::Concern
     included do
-      after_destroy :deactivate_host
+      before_destroy :deactivate_host
 
       def deactivate_host
-        logger.debug "Deactivating host #{name} in Puppetdb"                       
-        if SETTINGS[:puppetdb][:enabled] && SETTINGS[:puppetdb][:address].present?
-          begin                                                            
-            uri = URI.parse(SETTINGS[:puppetdb][:address])            
-            req = Net::HTTP::Post.new(uri.path) 
+        logger.debug "Deactivating host #{name} in Puppetdb"
+        return false unless configured?
+
+        if Setting[:puppetdb_enabled]
+          begin
+            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+'\""}'
-            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]                           
-                res.verify_mode = OpenSSL::SSL::VERIFY_PEER               
-              else 
-                res.verify_mode = OpenSSL::SSL::VERIFY_NONE 
-              end 
+            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]
+                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)
-              end                                                         
-            end                                                           
-            res.start { |http| http.request(req) }                        
-          rescue => e 
-            raise "Could not deactivate host: #{e}" 
-          end 
+              end
+            end
+            res.start { |http| http.request(req) }
+          rescue => e
+            errors.add(:base, _("Could not deactivate host on PuppetDB: #{e}"))
+          end
+          errors.empty?
+        end
+      end
+
+      private
+
+      def configured?
+        if Setting[:puppetdb_enabled] && Setting[:puppetdb_address].blank?
+          errors.add(:base, _("PuppetDB plugin is enabled but not configured. Please configure it before trying to delete a host."))
         end
+        errors.empty?
       end
     end
   end

data/app/models/setting/puppetdb.rb

@@ -0,0 +1,17 @@
+class Setting::Puppetdb < ::Setting
+  BLANK_ATTRS << 'puppetdb_address'
+
+  def self.load_defaults
+    Setting.transaction do
+      [
+        self.set('puppetdb_enabled', _("Integration with PuppetDB, enabled will deactivate a host in PuppetDB when it's deleted in Foreman"), 'false'),
+      ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
+    end
+
+    Setting.transaction do
+      [
+        self.set('puppetdb_address', _('Foreman will send PuppetDB requests to this address'), ''),
+      ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
+    end
+  end
+end

data/lib/puppetdb_foreman.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2013 CERN, Switzerland
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module PuppetdbForeman
   require 'puppetdb_foreman/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 end

data/lib/puppetdb_foreman/engine.rb

@@ -1,6 +1,31 @@
+#
+# Copyright 2013 CERN, Switzerland
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module PuppetdbForeman
   class Engine < ::Rails::Engine
 
+    initializer 'puppetdb_foreman.load_default_settings', :before => :load_config_initializers do |app|
+      require_dependency File.expand_path("../../../app/models/setting/puppetdb.rb", __FILE__) if (Setting.table_exists? rescue(false))
+    end
+
+    initializer 'puppetdb_foreman.register_plugin', :after=> :finisher_hook do |app|
+      Foreman::Plugin.register :puppetdb_foreman do
+        requires_foreman '> 1.0'
+      end
+    end
+
     config.to_prepare do
       if SETTINGS[:version].to_s.to_f >= 1.2
         # Foreman 1.2
@@ -10,6 +35,5 @@ module PuppetdbForeman
         Host.send :include, PuppetdbForeman::HostExtensions
       end
     end
-
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies: []
 description: At the moment it basically disables hosts on puppetdb after they are
   deleted in Foreman. Follow https://github.com/cernops/puppetdb_foreman and raise
@@ -20,31 +19,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/models/puppetdb_foreman/host_extensions.rb
+- app/models/setting/puppetdb.rb
 - lib/puppetdb_foreman.rb
 - lib/puppetdb_foreman/engine.rb
 homepage: http://www.github.com/cernops/puppetdb_foreman
-licenses: []
+licenses:
+- Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This is a foreman plugin to interact with puppetdb through callbacks.
 test_files: []
 has_rdoc: