Merge pull request #597 from ripienaar/0160

0160
choria-legacy · Sep 20, 2019 · 6555dab · 6555dab
2 parents 4e6220c + 518baed
commit 6555dab
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 |Date      |Issue |Description                                                                                              |
 |----------|------|---------------------------------------------------------------------------------------------------------|
-|2019/05/27|      |Release 0.15.0                                                                                           |
+|2019/09/20|      |Release 0.16.0                                                                                           |
+|2019/08/30|593   |Switch to using JSON format by default                                                                   |
+|2019/08/17|593   |Improve puppet db SRV lookup port resolution                                                             |
+|2019/06/07|590   |Allow playbook node sets to declare zero discovered hosts is ok with `empty_ok`                          |
 |2019/05/27|      |Release 0.15.0                                                                                           |
 |2019/05/02|585   |Add support for Choria Autonomous Agents                                                                 |
 |2019/03/19|583   |Fix path expansion for token locations with `~` in them                                                  |

diff --git a/lib/mcollective/agent/bolt_tasks.ddl b/lib/mcollective/agent/bolt_tasks.ddl
@@ -2,7 +2,7 @@ metadata :name => "bolt_tasks",
          :description => "Downloads and runs Puppet Tasks",
          :author => "R.I.Pienaar <rip@devco.net>",
          :license => "Apache-2.0",
-         :version => "0.15.0",
+         :version => "0.16.0",
          :url => "https://choria.io",
          :timeout => 60
 

diff --git a/lib/mcollective/agent/bolt_tasks.json b/lib/mcollective/agent/bolt_tasks.json
@@ -5,7 +5,7 @@
     "description": "Downloads and runs Puppet Tasks",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.14.1",
+    "version": "0.16.0",
     "url": "https://choria.io",
     "timeout": 60
   },

diff --git a/lib/mcollective/agent/choria_util.ddl b/lib/mcollective/agent/choria_util.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "choria_util",
             :description => "Choria Utilities",
             :author      => "R.I.Pienaar <rip@devco.net>",
             :license     => "Apache-2.0",
-            :version     => "0.15.0",
+            :version     => "0.16.0",
             :url         => "https://choria.io",
             :timeout     => 20
 

diff --git a/lib/mcollective/agent/choria_util.json b/lib/mcollective/agent/choria_util.json
@@ -5,7 +5,7 @@
     "description": "Choria Utilities",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache-2.0",
-    "version": "0.14.1",
+    "version": "0.16.0",
     "url": "https://choria.io",
     "timeout": 20
   },

diff --git a/lib/mcollective/agent/rpcutil.ddl b/lib/mcollective/agent/rpcutil.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "rpcutil",
             :description => "General helpful actions that expose stats and internals to SimpleRPC clients",
             :author      => "R.I.Pienaar <rip@devco.net>",
             :license     => "Apache License, Version 2.0",
-            :version     => "0.15.0",
+            :version     => "0.16.0",
             :url         => "https://docs.puppetlabs.com/mcollective/",
             :timeout     => 10
 

diff --git a/lib/mcollective/agent/rpcutil.json b/lib/mcollective/agent/rpcutil.json
@@ -5,7 +5,7 @@
     "description": "General helpful actions that expose stats and internals to SimpleRPC clients",
     "author": "R.I.Pienaar <rip@devco.net>",
     "license": "Apache License, Version 2.0",
-    "version": "0.14.1",
+    "version": "0.16.0",
     "url": "https://docs.puppetlabs.com/mcollective/",
     "timeout": 10
   },

diff --git a/lib/mcollective/connector/nats.ddl b/lib/mcollective/connector/nats.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "nats",
             :description => "Connector plugin for NATS.io middleware",
             :author      => "R.I.Pienaar <rip@devco.net>",
             :license     => "Apache-2.0",
-            :version     => "0.15.0",
+            :version     => "0.16.0",
             :url         => "https://github.com/choria-io",
             :timeout     => 60
 

diff --git a/lib/mcollective/data/bolt_task_data.ddl b/lib/mcollective/data/bolt_task_data.ddl
@@ -2,7 +2,7 @@ metadata    :name => "bolt_task",
             :description => "Information about past Bolt Task",
             :author => "R.I.Pienaar <rip@devco.net>",
             :license => "Apache-2.0",
-            :version => "0.15.0",
+            :version => "0.16.0",
             :url => "https://choria.io",
             :timeout => 1
 

diff --git a/lib/mcollective/discovery/choria.ddl b/lib/mcollective/discovery/choria.ddl
@@ -2,7 +2,7 @@ metadata    :name        => "choria",
             :description => "PuppetDB based discovery for the Choria plugin suite",
             :author      => "R.I.Pienaar <rip@devco.net>",
             :license     => "Apache-2.0",
-            :version     => "0.15.0",
+            :version     => "0.16.0",
             :url         => "https://github.com/choria-io",
             :timeout     => 0
 

diff --git a/lib/mcollective/util/choria.rb b/lib/mcollective/util/choria.rb
@@ -8,7 +8,7 @@ class UserError < StandardError; end
       class Abort < StandardError; end
 
       unless defined?(Choria::VERSION) # rubocop:disable Style/IfUnlessModifier
-        VERSION = "0.15.0".freeze
+        VERSION = "0.16.0".freeze
       end
 
       attr_writer :ca

diff --git a/lib/mcollective/validator/bolt_task_name_validator.ddl b/lib/mcollective/validator/bolt_task_name_validator.ddl
@@ -2,6 +2,6 @@ metadata    :name => "bolt_task_name",
             :description => "Validates that a string matches Bolt Task Name",
             :author => "R.I.Pienaar <rip@devco.net>",
             :license => "Apache-2.0",
-            :version => "0.15.0",
+            :version => "0.16.0",
             :url => "https://choria.io",
             :timeout => 1
diff --git a/module/choria/data/puppet_aio/6.yaml b/module/choria/data/puppet_aio/6.yaml
@@ -1,5 +1,5 @@
 mcollective_choria::gem_dependencies:
-  "choria-mcorpc-support": "2.20.5"
+  "choria-mcorpc-support": "2.20.6"
 
 mcollective_choria::config:
   security.serializer: "json"
diff --git a/module/choria/metadata.json b/module/choria/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "choria-mcollective_choria",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "author": "R.I.Pienaar <rip@devco.net>",
   "summary": "A suite of MCollective Plugins for AIO Puppet",
   "license": "Apache-2.0",

diff --git a/module/tasks/metadata.json b/module/tasks/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "choria-mcollective_agent_bolt_tasks",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "author": "R.I.Pienaar <rip@devco.net>",
   "summary": "Puppet Tasks integration for Choria",
   "license": "Apache-2.0",
@@ -9,7 +9,7 @@
   "issues_url": "https://github.com/choria-io/mcollective-choria/issues",
   "dependencies": [
     { "name": "choria/mcollective","version_requirement":">= 0.9.0 < 2.0.0"},
-    { "name": "choria/mcollective_choria","version_requirement":"0.15.0"}
+    { "name": "choria/mcollective_choria","version_requirement":"0.16.0"}
   ],
   "requirements": [
     {