Fixes #26739 - Add admin users locale and timezone setting

dandruczyk · Jan 27, 2020 · 3c8f990 · 3c8f990
1 parent 9aa2817
commit 3c8f990
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/manifests/database.pp b/manifests/database.pp
@@ -15,6 +15,8 @@
       'SEED_ADMIN_FIRST_NAME' => $::foreman::initial_admin_first_name,
       'SEED_ADMIN_LAST_NAME'  => $::foreman::initial_admin_last_name,
       'SEED_ADMIN_EMAIL'      => $::foreman::initial_admin_email,
+      'SEED_ADMIN_LOCALE'     => $::foreman::initial_admin_locale,
+      'SEED_ADMIN_TIMEZONE'   => $::foreman::initial_admin_timezone,
       'SEED_ORGANIZATION'     => $::foreman::initial_organization,
       'SEED_LOCATION'         => $::foreman::initial_location,
     }

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -12,6 +12,10 @@
 #
 # $initial_admin_email::          Initial E-mail address of the admin user
 #
+# $initial_admin_locale::         Initial locale (= language) of the admin user
+#
+# $initial_admin_timezone::       Initial timezone of the admin user
+#
 # $db_manage::                    If enabled, will install and configure the database server on this host
 #
 # $email_delivery_method::        Email delivery method
@@ -252,6 +256,8 @@
   Optional[String] $initial_admin_first_name = $::foreman::params::initial_admin_first_name,
   Optional[String] $initial_admin_last_name = $::foreman::params::initial_admin_last_name,
   Optional[String] $initial_admin_email = $::foreman::params::initial_admin_email,
+  Optional[String] $initial_admin_locale = $::foreman::params::initial_admin_locale,
+  Optional[String] $initial_admin_timezone = $::foreman::params::initial_admin_timezone,
   Optional[String] $initial_organization = $::foreman::params::initial_organization,
   Optional[String] $initial_location = $::foreman::params::initial_location,
   Boolean $ipa_authentication = $::foreman::params::ipa_authentication,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -165,6 +165,8 @@
   $initial_admin_first_name = undef
   $initial_admin_last_name = undef
   $initial_admin_email = undef
+  $initial_admin_locale = undef
+  $initial_admin_timezone = undef
 
   # Initial taxonomies
   $initial_organization = undef

diff --git a/spec/classes/foreman_spec.rb b/spec/classes/foreman_spec.rb
@@ -239,6 +239,8 @@
             initial_admin_first_name: 'Alice',
             initial_admin_last_name: 'Bob',
             initial_admin_email: '[email protected]',
+            initial_admin_locale: 'en_GB',
+            initial_admin_timezone: 'Hawaii',
             initial_organization: 'acme',
             initial_location: 'acme',
             ipa_authentication: false,