Merge pull request #288 from ripienaar/287

(#287) add choria::kv_buckets and choria::governors

Author: ripienaar

lib/puppet/provider/choria_governor/choria_governor.rb

@@ -19,18 +19,45 @@ def update(context, name, should)
 
   def run(action, ens, args={})
     args.delete(:ensure)
-    parse_result(Puppet::Util::Execution.execute(make_cmd(action, args), :failonfail => false, :custom_environment => environment), ens)
+    parse_result(Puppet::Util::Execution.execute(make_cmd(action, args), :failonfail => true, :custom_environment => environment), ens)
+  end
+
+  def config_file
+    paths = if Process.uid == 0
+      [
+        "/etc/choria/server.conf",
+        "/usr/local/etc/choria/server.conf",
+      ]
+    else
+      [
+        "/etc/choria/client.conf",
+        "/usr/local/etc/choria/client.conf",
+      ]
+    end
+
+    paths.each do |p|
+      return p if File.exist?(p)
+    end
+
+    raise("cannot find configuration path")
   end
 
   def make_cmd(action, args={})
     choria = Puppet::Util.which("choria")
     raise("cannot find choria executable") if choria == ""
 
-    cmd = [choria, "gov", "api", "--%s" % action]
-    args.each {|k, v|
-      cmd << "--%s" % k
-      cmd << v unless v.is_a?(TrueClass)
-    }
+    cmd = [choria, "governor", "api", "--%s" % action, "--config=%s" % config_file]
+
+    args.each do |k, v|
+      k = k.to_s.gsub("_", "-")
+      if v.is_a?(TrueClass)
+        cmd << "--%s" % k
+      elsif v.is_a?(FalseClass)
+        cmd << "--no-%s" % k
+      else
+        cmd << "--%s=%s" % [k, v]
+      end
+    end
 
     cmd.join(" ")
   end

lib/puppet/provider/choria_kv_bucket/choria_kv_bucket.rb

@@ -19,18 +19,45 @@ def update(context, name, should)
 
   def run(action, ens, args={})
     args.delete(:ensure)
-    parse_result(Puppet::Util::Execution.execute(make_cmd(action, args), :failonfail => false, :custom_environment => environment), ens)
+    parse_result(Puppet::Util::Execution.execute(make_cmd(action, args), :failonfail => true, :custom_environment => environment), ens)
+  end
+
+  def config_file
+    paths = if Process.uid == 0
+      [
+        "/etc/choria/server.conf",
+        "/usr/local/etc/choria/server.conf",
+      ]
+    else
+      [
+        "/etc/choria/client.conf",
+        "/usr/local/etc/choria/client.conf",
+      ]
+    end
+
+    paths.each do |p|
+      return p if File.exist?(p)
+    end
+
+    raise("cannot find configuration path")
   end
 
   def make_cmd(action, args={})
     choria = Puppet::Util.which("choria")
     raise("cannot find choria executable") if choria == ""
 
-    cmd = [choria, "kv", "api", "--%s" % action]
-    args.each {|k, v|
-      cmd << "--%s" % k
-      cmd << v unless v.is_a?(TrueClass)
-    }
+    cmd = [choria, "kv", "api", "--%s" % action, "--config=%s" % config_file]
+
+    args.each do |k, v|
+      k = k.to_s.gsub("_", "-")
+      if v.is_a?(TrueClass)
+        cmd << "--%s" % k
+      elsif v.is_a?(FalseClass)
+        cmd << "--no-%s" % k
+      else
+        cmd << "--%s=%s" % [k, v]
+      end
+    end
 
     cmd.join(" ")
   end

lib/puppet/type/choria_governor.rb

@@ -23,11 +23,13 @@
     expire: {
       type: "Integer",
       desc: "How long before a slot reservation is forcibly timed out",
+      default: 0
     },
 
     replicas: {
       type: "Integer[1,5]",
       desc: "In clustered environments this is how many active Replicas of the data and configuration is kept, odd number is best",
+      default: 1,
     },
 
     collective: {

lib/puppet/type/choria_kv_bucket.rb

@@ -24,7 +24,7 @@
     expire: {
       type: "Integer",
       desc: "How long before a value expires from the bucket, in seconds",
-      default: -1
+      default: 0
     },
 
     replicas: {

manifests/broker.pp

@@ -24,10 +24,9 @@
 #    adapters => {
 #      discovery => {
 #        stream => {
-#          type => "nats_stream",
-#          servers => ["stan1:4222", "stan2:4222"],
-#          clusterid => "prod",
-#          topic => "discovery",
+#          type => "choria_streams",
+#          servers => ["choria1:4222", "choria2:4222"],
+#          topic => "choria.node_metadata.%s",
 #          workers => 10,
 #        },
 #        ingest => {

manifests/governors.pp

@@ -0,0 +1,15 @@
+# Adds a series of choria_governor resources
+#
+# @private
+class choria::governors {
+  assert_private()
+
+  require(Class["choria::config"])
+
+  $choria::governors.each |$governor, $properties| {
+    choria_governor{$governor:
+      * => $properties
+    }
+  }
+}
+

manifests/init.pp

@@ -34,6 +34,8 @@
 # @param server_config Configuration for the Choria Server
 # @param manage_package_repo Installs the package repositories
 # @param nightly_repo Install the nightly package repo as well as the release one
+# @param kv_buckets Hash of choria_kv_bucket resources for a node, ideal for use using Hiera
+# @param governors Hash of choria_governor resources for a node, ideal for use using Hiera
 class choria (
   Boolean $manage_package,
   Boolean $manage_service,
@@ -72,6 +74,8 @@
   Stdlib::Absolutepath $broker_logfile = $logfile,
   Stdlib::Absolutepath $server_logfile = $logfile,
   Boolean $manage_mcollective = true,
+  Choria::KVBuckets $kv_buckets = {},
+  Choria::Governors $governors = {},
 ) {
   if $manage_package_repo {
     class{"choria::repo":
@@ -108,4 +112,6 @@
   contain choria::install
   contain choria::scout_checks
   contain choria::scout_metrics
+  contain choria::kv_buckets
+  contain choria::governors
 }

manifests/kv_buckets.pp

@@ -0,0 +1,14 @@
+# Adds a series of choria_kv_bucket resources
+#
+# @private
+class choria::kv_buckets {
+  assert_private()
+
+  require(Class["choria::config"])
+
+  $choria::kv_buckets.each |$bucket, $properties| {
+    choria_kv_bucket{$bucket:
+      * => $properties
+    }
+  }
+}

types/adapters.pp

@@ -1,4 +1,3 @@
 type Choria::Adapters = Variant[
-  Hash[String, Choria::Adapters::NatsStream, 0],
   Hash[String, Choria::Adapters::ChoriaStreams, 0]
 ]