sigh, include the params class

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index 5a96209..111b4f1 100644 (file)
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -8,9 +8,9 @@
 #
 class roles::dbmaster {
 
-       include roles::pubsub::params
+       include roles::pubsub::parameters
 
-       $rabbit_password = $roles::pubsub::params::rabbit_password
+       $rabbit_password = $roles::pubsub::parameters::rabbit_password
 
        ssl::service { 'db.debian.org':
                notify => Service['apache2'],

diff --git a/modules/roles/manifests/pubsub/client.pp b/modules/roles/manifests/pubsub/client.pp
index df220ff..e2a1083 100644 (file)
--- a/modules/roles/manifests/pubsub/client.pp
+++ b/modules/roles/manifests/pubsub/client.pp
@@ -8,9 +8,9 @@
 #
 class roles::pubsub::client {
 
-       include roles::pubsub::params
+       include roles::pubsub::parameters
 
-       $rabbit_password = $roles::pubsub::params::rabbit_password
+       $rabbit_password = $roles::pubsub::parameters::rabbit_password
 
        package { 'python-dsa-mq':
                ensure => latest,

diff --git a/modules/roles/manifests/pubsub/parameters.pp b/modules/roles/manifests/pubsub/parameters.pp
new file mode 100644 (file)
index 0000000..3f89eb6
--- /dev/null
+++ b/modules/roles/manifests/pubsub/parameters.pp
@@ -0,0 +1,12 @@
+# = Class: roles::pubsub::parameters
+#
+# Params for pubsub client
+#
+# == Sample Usage:
+#
+#   include roles::pubsub::parameters
+#
+class roles::pubsub::parameters {
+
+       $rabbit_password = hkdf('/etc/puppet/secret', "mq-client-${::fqdn}")
+}