Lint, use facts hash

deric · Sep 13, 2022 · a57cbc2 · a57cbc2
1 parent b466d48
commit a57cbc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/manifests/install/repo.pp b/manifests/install/repo.pp
@@ -5,7 +5,7 @@
 # PRIVATE CLASS - do not use directly (use main `zookeeper` class).
 class zookeeper::install::repo inherits zookeeper::install {
   if $zookeeper::repo {
-    case $facts['os']['family']{
+    case $facts['os']['family'] {
       'RedHat', 'Suse': {
         $_config = $zookeeper::repo
         validate_hash($_config)

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -24,7 +24,7 @@
         'service_name'             => 'zookeeper',
         'service_provider'         => $initstyle,
         'shell'                    => '/bin/false',
-        'initialize_datastore_bin' => '/usr/bin/zookeeper-server-initialize'
+        'initialize_datastore_bin' => '/usr/bin/zookeeper-server-initialize',
       }
       # 'environment' file probably read just by Debian
       # see #16, #81
@@ -49,7 +49,7 @@
         'service_name'             => 'zookeeper-server',
         'service_provider'         => $initstyle,
         'shell'                    => '/sbin/nologin',
-        'initialize_datastore_bin' => '/usr/bin/zookeeper-server-initialize'
+        'initialize_datastore_bin' => '/usr/bin/zookeeper-server-initialize',
       }
       $environment_file = 'java.env'
     }
@@ -66,7 +66,7 @@
         'service_name'             => 'zookeeper-server',
         'service_provider'         => $initstyle,
         'shell'                    => '/bin/false',
-        'initialize_datastore_bin' => '/usr/bin/zookeeper-server-initialize'
+        'initialize_datastore_bin' => '/usr/bin/zookeeper-server-initialize',
       }
       $environment_file = 'java.env'
     }
@@ -134,13 +134,13 @@
   $ssl_ciphersuites = ''
   $ssl_hostname_verification = true
   $ssl_clientauth = 'none'
-  $keystore_location = "/etc/zookeeper/conf/keystores/${::fqdn}.pem"
+  $keystore_location = "/etc/zookeeper/conf/keystores/${facts['networking']['fqdn']}.pem"
   $keystore_type = 'PEM'
   $keystore_password = undef
   $truststore_location = '/etc/ssl/certs/ca-certificates.crt'
   $truststore_type = 'PEM'
   $truststore_password = undef
-  $keystore_quorum_location = "/etc/zookeeper/conf/keystores/${::fqdn}.pem"
+  $keystore_quorum_location = "/etc/zookeeper/conf/keystores/${facts['networking']['fqdn']}.pem"
   $keystore_quorum_type = 'PEM'
   $keystore_quorum_password = undef
   $truststore_quorum_location = '/etc/ssl/certs/ca-certificates.crt'