Moved hiera hierachy file, and made

minor changes to the hiera examples.

Author: jorhett

Diff for: hiera.yaml

@@ -0,0 +1,9 @@
+---
+:backends:
+    - yaml
+:yaml:
+    :datadir: '/etc/puppet/environments/%{::environment}/hieradata'
+:hierarchy:
+    - %{::certname}
+    - %{::operatingsystem}
+    - common

Diff for: hieradata/activemq.example.net.yaml

@@ -0,0 +1,28 @@
+# Add these hiera values to a hiera file used by the middleware broker(s)
+# The middleware broker  will also have the client libraries (optional)
+#
+classes:
+  - mcollective::activemq
+  - mcollective::client
+
+# Middleware configuration
+# You must define these
+# use a command like 'openssl rand -base64 24' to generate unique values
+mcollective::middleware::keystore_password  : ''
+mcollective::middleware::truststore_password: ''
+
+mcollective::client::package_ensure: 'latest'
+mcollective::client::unix_group    : 'wheel'
+
+# Client plugins to install
+mcollective::plugin::clients:
+  filemgr:
+    version: 'latest'
+  nettest:
+    version: 'latest'
+  package:
+    version: 'latest'
+  puppet:
+    version: 'latest'
+  service:
+    version: 'latest'

Diff for: hieradata/client.yaml renamed to hieradata/client.example.net.yaml

@@ -8,9 +8,13 @@ mcollective::client::unix_group    : 'wheel'
 
 # Client plugins to install
 mcollective::plugin::clients:
-  package:
+  filemgr:
     version: 'latest'
-  service:
+  nettest:                                                                                                                                                                                   
+    version: 'latest'
+  package:
     version: 'latest'
   puppet:
     version: 'latest'
+  service:
+    version: 'latest'

Diff for: hieradata/common.yaml

@@ -28,10 +28,15 @@ mcollective::client::package_ensure: 'absent'
 
 # Agent plugins to install
 mcollective::plugin::agents:
+  filemgr:
+    version: 'latest'
+  nettest:                                                                                                                                                                                   
+    version: 'latest'
   package:
     version: 'latest'
   service:
     version: 'latest'
+  # puppet has dependency on another package
   puppet :
     version     : 'latest'
     dependencies: