Merge pull request #539 from ripienaar/538

(#538) ensure json serializer is used on AIO 6

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "nats-pure", "~> 0.4"
+gem "nats-pure", "~> 0.5"
 
 group :development, :test do
   gem "coveralls"

Gemfile.lock

@@ -175,7 +175,7 @@ DEPENDENCIES
   listen (~> 3)
   mcollective-client
   mocha
-  nats-pure (~> 0.4)
+  nats-pure (~> 0.5)
   puppet (~> 5.4)
   rake
   rspec

module/choria/data/puppet_aio/6.yaml

@@ -0,0 +1,2 @@
+mcollective_choria::config:
+  security.serializer: "json"

module/choria/hiera.yaml

@@ -8,7 +8,12 @@ defaults:
 hierarchy:
   - name: "Distribution Name"
     path: "%{facts.os.name}.yaml"
+
+  - name: "AIO version specific common"
+    path: "puppet_aio/%{facts.mcollective.aio_major_version}.yaml"
+
   - name: "plugin"
     path: "plugin.yaml"
+
   - name: "defaults"
     path: "defaults.yaml"

module/choria/metadata.json

@@ -8,7 +8,7 @@
   "project_page": "https://github.com/choria-io/mcollective-choria/wiki",
   "issues_url": "https://github.com/choria-io/mcollective-choria/issues",
   "dependencies": [
-    { "name": "choria/mcollective","version_requirement":">= 0.7.0 < 2.0.0"},
+    { "name": "choria/mcollective","version_requirement":">= 0.9.0 < 2.0.0"},
     { "name": "choria/mcollective_agent_puppet", "version_requirement": ">= 2.2.0" },
     { "name": "choria/mcollective_agent_package", "version_requirement": ">= 5.0.1" },
     { "name": "choria/mcollective_agent_service", "version_requirement": ">= 4.0.1" },
@@ -18,7 +18,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.9.0 < 6.0.0"
+      "version_requirement": ">= 4.9.0 < 7.0.0"
     }
   ]
 }