Use cache_data and random_password from extlib

theforeman · Oct 12, 2015 · 3165a55 · 3165a55
1 parent 86fc44e
commit 3165a55
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,6 +1,7 @@
 fixtures:
   repositories:
     stdlib:        "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    extlib:        "git://github.com/puppet-community/puppet-extlib.git"
     foreman:       "git://github.com/theforeman/puppet-foreman.git"
     common:        "git://github.com/katello/puppet-common.git"
   symlinks:

diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp
@@ -39,7 +39,7 @@
     password_file => $certs::ca_key_password_file,
   }
 
-  $keystore_password = cache_data($keystore_password_file, random_password(32))
+  $keystore_password = cache_data('foreman_cache_data', $keystore_password_file, random_password(32))
   $password_file = "${certs::pki_dir}/keystore_password-file"
   $client_req = "${certs::pki_dir}/java-client.req"
   $client_cert = "${certs::pki_dir}/certs/${java_client_cert_name}.crt"

diff --git a/manifests/gutterball.pp b/manifests/gutterball.pp
@@ -18,7 +18,7 @@
   $key = "${pki_dir}/gutterball.key"
   $cert = "${pki_dir}/gutterball.crt"
 
-  $gutterball_keystore_password = cache_data('gutterball_keystore_password', random_password(32))
+  $gutterball_keystore_password = cache_data('foreman_cache_data', 'gutterball_keystore_password', random_password(32))
 
   $keypair= 'gutterball-certs'
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -124,7 +124,7 @@
   $ca_key = "${certs::pki_dir}/private/${default_ca_name}.key"
   $ca_cert = "${certs::pki_dir}/certs/${default_ca_name}.crt"
   $ca_cert_stripped = "${certs::pki_dir}/certs/${default_ca_name}-stripped.crt"
-  $ca_key_password = cache_data('ca_key_password', random_password(24))
+  $ca_key_password = cache_data('foreman_cache_data', 'ca_key_password', random_password(24))
   $ca_key_password_file = "${certs::pki_dir}/private/${default_ca_name}.pwd"
 
   $katello_server_ca_cert = "${certs::pki_dir}/certs/${server_ca_name}.crt"

diff --git a/metadata.json b/metadata.json
@@ -12,9 +12,13 @@
       "name": "puppetlabs-stdlib",
       "version_requirement": ">= 4.2.0 < 5.0.0"
     },
+    {
+      "name": "puppet-extlib",
+      "version_requirement": ">= 0.10.4 < 1.0.0"
+    },
     {
       "name": "theforeman-foreman",
-      "version_requirement": ">= 4.0.0 < 5.0.0"
+      "version_requirement": ">= 5.0.0 < 6.0.0"
     },
     {
       "name": "katello-common",