Browse code
Set fixed-key key manager
With the key manager refactoring in nova and cinder, the key manager
class will need to be explicitly set.
Nova key manager refactoring: Ib563b0ea4b8b4bc1833bf52bf49a68546c384996
Cinder key manager refactoring: Ief8885bb4ca8d62b03cf1a52c25dd0e62c835bfe
Change-Id: I733279864ee1a4aaffc9c8eed81b5e12f8d8821b
Implements: blueprint use-castellan-key-manager
Kaitlin Farr authored on 2016/01/27 12:46:13Showing 2 changed files
| ... | ... |
@@ -283,6 +283,8 @@ function configure_cinder {
|
| 283 | 283 |
|
| 284 | 284 |
iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME" |
| 285 | 285 |
|
| 286 |
+ iniset $CINDER_CONF key_manager api_class cinder.keymgr.conf_key_mgr.ConfKeyManager |
|
| 287 |
+ |
|
| 286 | 288 |
if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then |
| 287 | 289 |
local enabled_backends="" |
| 288 | 290 |
local default_name="" |
| ... | ... |
@@ -475,6 +475,8 @@ function create_nova_conf {
|
| 475 | 475 |
iniset $NOVA_CONF DEFAULT metadata_listen "$NOVA_SERVICE_LISTEN_ADDRESS" |
| 476 | 476 |
iniset $NOVA_CONF DEFAULT s3_listen "$NOVA_SERVICE_LISTEN_ADDRESS" |
| 477 | 477 |
|
| 478 |
+ iniset $NOVA_CONF key_manager api_class nova.keymgr.conf_key_mgr.ConfKeyManager |
|
| 479 |
+ |
|
| 478 | 480 |
if is_fedora || is_suse; then |
| 479 | 481 |
# nova defaults to /usr/local/bin, but fedora and suse pip like to |
| 480 | 482 |
# install things in /usr/bin |