puppetdb_foreman 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDJmZTBhM2Q1YTc2Zjg5ZjU4YjMwZGNiYzE0OTE0NjY3ZTMzMmMxZQ==
+    Y2ZlNTE5MTNiMjBkNmRkMzQ1ZTVlYmU2OGU1NTNjODg3NmQxYWViOA==
   data.tar.gz: !binary |-
-    NmZlNTY3OWQ3MzI2ZDRjNDI1ZjI2NTZjYmI1M2VhYTRkODliMGU3MQ==
+    NjEwZjQzMTlmZmIzNGIyZWFjMjYwNTk0YmY0YjE0NGNlNTZjZDllMQ==
 SHA512:
   metadata.gz: !binary |-
-    NTVkMmVmMmZkMjJmZGRmNDYyNDZmMmI5M2ExYTZhMjg3MDAxYWFkNDEzYTA1
-    NzEwZTdjMTQ0MTEzNjJjMjNlOWViYzExY2FjYmVkNWNjMDFkZmQ1OTY5MjM5
-    MzNiZGI5NzcwMjQ2NDc1ODkxMGQ1N2EwZjJkN2JjNTY0NzYxYmI=
+    YjBmOWFlNGI2Y2MxZDEwYjc5MDE0ZjkzN2FjZmQ2MzczOWQ5NTUxZDUwNDlk
+    NWJlYmRmMGQyYjliNWU1MmMxMGZlODAyOGYwN2NkOTRmOThjMWYyY2E0YjJi
+    MTEwYmE2OWUzODY3NjRlNjAyMWZkMTFhY2MyZDFlNjBmZGUzZGE=
   data.tar.gz: !binary |-
-    ZTZmMzhmZjE3Zjk0N2RlYjZjMGE2OGZiZjI1NmIxM2Q3Y2Y1YTJlNjUyZTc0
-    ZjNjOTU4ZmY0YzdlNzg4MWY0YjkxYWJmYzUzOWQwOTgwMDQzNTYyZjI4NTNk
-    MzE1OTk0NDJmOTZjNTRjMTgwZGU2ZDE1YzJjMDQ5OWQzODBlOWY=
+    Njk4OGIwZTc0ZTlmYjNmMzVkYTkyMTFjMzhhZWM4NTNkZGUxNzMxNzI3ZTQ2
+    MmJhNTYzZjFiZDRlNTViOWRhOGM3MWVhMTExNTdmYmQzNzNkNWZlY2QzMGM2
+    YzkwY2ZjM2NhOTM5MzlkMDNhMzI4NDNhNmI2ZDRhNmFmNzkxNjU=

data/app/models/setting/puppetdb.rb

@@ -2,15 +2,23 @@ class Setting::Puppetdb < ::Setting
   BLANK_ATTRS << 'puppetdb_address'
 
   def self.load_defaults
+    if SETTINGS[:puppetdb].present?
+      default_enabled = SETTINGS[:puppetdb][:enabled]
+      default_address = SETTINGS[:puppetdb][:address]
+    end
+
+    default_enabled ||= 'false'
+    default_address ||= 'https://puppetdb:8081/v2/commands'
+
     Setting.transaction do
       [
-        self.set('puppetdb_enabled', _("Integration with PuppetDB, enabled will deactivate a host in PuppetDB when it's deleted in Foreman"), 'false'),
+        self.set('puppetdb_enabled', _("Integration with PuppetDB, enabled will deactivate a host in PuppetDB when it's deleted in Foreman"), default_enabled)
       ].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'), ''),
+        self.set('puppetdb_address', _('Foreman will send PuppetDB requests to this address'), default_address)
       ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-07-21 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