Merge pull request #325 from ripienaar/0_29_0

(misc) Release 0.29.0

Rakefile

@@ -1,11 +1,4 @@
+require "puppet"
 require "puppetlabs_spec_helper/rake_tasks"
 
-begin
-  if Gem::Specification::find_by_name("puppet-lint")
-    require "puppet-lint/tasks/puppet-lint"
-    PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"]
-    task :default => [:spec, :lint]
-  end
-rescue Gem::LoadError
-  task :default => :spec
-end
+task :default => :spec

data/os/Debian.yaml

@@ -1,2 +1,2 @@
 ---
-choria::version: "0.26.2+%{facts.os.distro.codename}"
+choria::version: "0.27.0+%{facts.os.distro.codename}"

data/os/RedHat.yaml

@@ -1,2 +1,2 @@
 ---
-choria::version: "0.26.2"
+choria::version: "0.27.0"

manifests/broker.pp

@@ -66,8 +66,6 @@
 class choria::broker (
   Boolean $network_broker,
   Boolean $federation_broker,
-  Optional[String] $federation_cluster,
-  Optional[String] $cluster_name,
   Boolean $manage_service,
   Stdlib::Host $listen_address,
   Stdlib::Host $stats_listen_address,
@@ -83,9 +81,6 @@
   Choria::Adapters $adapters,
   Choria::Leafnodes $leafnode_upstreams,
   String $identity,
-  Optional[Stdlib::Absolutepath] $ssldir = undef,
-  Optional[Integer] $tls_timeout = undef,
-  Optional[Stdlib::Absolutepath] $stream_store = undef,
   String $advisory_retention,
   Integer $advisory_replicas,
   String $event_retention,
@@ -96,6 +91,11 @@
   String $system_password,
   String $provisioner_password,
   String $provisioning_signer_source,
+  Optional[String] $federation_cluster,
+  Optional[String] $cluster_name,
+  Optional[Stdlib::Absolutepath] $ssldir = undef,
+  Optional[Integer] $tls_timeout = undef,
+  Optional[Stdlib::Absolutepath] $stream_store = undef,
 ) {
   require choria
 

manifests/broker/config.pp

@@ -6,10 +6,10 @@
 
   if $choria::broker::stream_store {
     file{$choria::broker::stream_store:
+      ensure => directory,
       owner  => "root",
       group  => $choria::config_group,
       mode   => "0750",
-      ensure => directory,
       before => File[$choria::broker_config_file]
     }
   }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "choria-choria",
-  "version": "0.28.4",
+  "version": "0.29.0",
   "author": "R.I.Pienaar <[email protected]>",
   "license": "Apache-2.0",
   "summary": "Install and manage the Choria plugin for MCollective",
@@ -10,7 +10,7 @@
   "dependencies": [
     { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.24.0 < 9.0.0" },
     { "name": "puppetlabs/apt", "version_requirement": ">= 4.5.1 < 10.0.0" },
-    { "name": "choria/mcollective_choria", "version_requirement": ">= 0.21.4 < 2.0.0" },
+    { "name": "choria/mcollective_choria", "version_requirement": ">= 0.21.5 < 2.0.0" },
     { "name": "choria/mcollective", "version_requirement": ">= 0.14.3 < 2.0.0" },
     { "name": "choria/mcollective_agent_puppet", "version_requirement": ">= 2.4.1" },
     { "name": "choria/mcollective_agent_package", "version_requirement": ">= 5.4.0" },