some cleanup/corrections

EthACKdotOrg · Dec 17, 2014 · 00cdfc8 · 00cdfc8
1 parent a702d55
commit 00cdfc8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -388,7 +388,6 @@
         dir_port         => $dir_port,
         dir_protocol     => $dir_protocol,
         manage_jks       => $manage_ssl,
-        mrc_ca           => $mrc_ca,
         object_dir       => $object_dir,
         properties       => $properties,
         ssl_source_dir   => $ssl_source_dir,

diff --git a/manifests/roles/client.pp b/manifests/roles/client.pp
@@ -20,9 +20,8 @@
   include ::fogstore::params
   include ::fogstore::user
 
-  if !$admin_password or $admin_password == '' {
-    fail 'Need admin_password for client role'
-  }
+  validate_string($admin_password)
+  validate_slength($admin_password, 24, 5)
 
   if $manage_ssl {
     Fogstore::Ssl::Credential <||> ->

diff --git a/manifests/roles/osd.pp b/manifests/roles/osd.pp
@@ -32,7 +32,6 @@
   $dir_port         = $fogstore::params::dir_port,
   $dir_protocol     = $fogstore::params::dir_protocol,
   $manage_jks       = $fogstore::params::manage_ssl,
-  $mrc_ca           = $fogstore::params::mrc_ca,
   $object_dir       = $fogstore::params::object_dir,
   $properties       = $fogstore::params::properties,
   $ssl_source_dir   = $fogstore::params::ssl_source_dir,
@@ -43,6 +42,13 @@
 
   include ::fogstore::user
 
+  if $client_ca == '' {
+    fail 'Need client_ca for OSD role'
+  }
+  if $dir_ca == '' {
+    fail 'Need dir_ca for OSD role'
+  }
+
   # Set SSL configuration by default
   $local_properties = {
     'ssl.enabled' =>
@@ -65,7 +71,6 @@
     ::fogstore::ssl::trusted {'osd':
       client_ca        => $client_ca,
       dir_ca           => $dir_ca,
-      mrc_ca           => $mrc_ca,
       osd_jks_password => $trusted_password,
       ssl_source_dir   => $ssl_source_dir,
     }