Browse code

Merge "Allow setup of credential encryption using fernet"

Jenkins authored on 2016/09/02 04:55:06
Showing 1 changed files
... ...
@@ -345,6 +345,8 @@ function configure_keystone {
345 345
 
346 346
     iniset $KEYSTONE_CONF fernet_tokens key_repository "$KEYSTONE_CONF_DIR/fernet-keys/"
347 347
 
348
+    iniset $KEYSTONE_CONF credential key_repository "$KEYSTONE_CONF_DIR/credential-keys/"
349
+
348 350
     # Configure the project created by the 'keystone-manage bootstrap' as the cloud-admin project.
349 351
     # The users from this project are globally admin as before, but it also
350 352
     # allows policy changes in order to clarify the adminess scope.
... ...
@@ -514,6 +516,9 @@ function init_keystone {
514 514
         rm -rf "$KEYSTONE_CONF_DIR/fernet-keys/"
515 515
         $KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF fernet_setup
516 516
     fi
517
+    rm -rf "$KEYSTONE_CONF_DIR/credential-keys/"
518
+    $KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF credential_setup
519
+
517 520
 }
518 521
 
519 522
 # install_keystoneauth() - Collect source and prepare