Merge pull request #285 from vchepkov/token

allow to customize admin's token lifetime

Author: ody

Diff for: plans/install.pp

@@ -59,6 +59,7 @@
   Optional[String]                  $stagingdir             = undef,
   Enum[direct,bolthost]             $download_mode          = 'bolthost',
   Boolean                           $permit_unsafe_versions = false,
+  String                            $token_lifetime         = '1y',
 ) {
   peadm::assert_supported_bolt_version()
 
@@ -96,6 +97,7 @@
     stagingdir                     => $stagingdir,
     download_mode                  => $download_mode,
     permit_unsafe_versions         => $permit_unsafe_versions,
+    token_lifetime                 => $token_lifetime,
   )
 
   $configure_result = run_plan('peadm::subplans::configure',

Diff for: plans/subplans/install.pp

@@ -58,6 +58,7 @@
   String                $stagingdir             = '/tmp',
   Enum[direct,bolthost] $download_mode          = 'bolthost',
   Boolean               $permit_unsafe_versions = false,
+  String                $token_lifetime         = '1y',
 ) {
   peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
 
@@ -325,7 +326,8 @@
   run_command('systemctl stop pe-puppetdb', $primary_target)
   run_command('systemctl start pe-puppetdb', $primary_target)
   run_task('peadm::rbac_token', $primary_target,
-    password => $console_password,
+    password       => $console_password,
+    token_lifetime => $token_lifetime,
   )
 
   # Stub a production environment and commit it to file-sync. At least one

Diff for: tasks/rbac_token.json

@@ -4,6 +4,10 @@
     "password": {
       "type": "String",
       "description": "The password for the admin user"
+    },
+    "token_lifetime": {
+      "type": "String",
+      "description": "The duration for which a token will be valid. Format <integer>[smhdy]"
     }
   },
   "input_method": "stdin",

Diff for: tasks/rbac_token.rb

@@ -17,7 +17,7 @@
 body = {
   'login'    => 'admin',
   'password' => $params['password'],
-  'lifetime' => '1y',
+  'lifetime' => $params['token_lifetime'],
   'label'    => 'provision-time token',
 }.to_json