Browse Source

Merge "Add cinder credentials to nova conf" into stable/stein

changes/63/660763/1
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
dd200499de
  1. 2
      deployment/cinder/cinder-api-container-puppet.yaml
  2. 2
      deployment/cinder/cinder-base.yaml
  3. 14
      deployment/nova/nova-compute-container-puppet.yaml

2
deployment/cinder/cinder-api-container-puppet.yaml

@ -54,7 +54,7 @@ parameters:
Whether to create cron job for purging soft deleted rows in Cinder database.
type: boolean
CinderPassword:
description: The password for the cinder service account, used by cinder-api.
description: The password for the cinder service and db account.
type: string
hidden: true
KeystoneRegion:

2
deployment/cinder/cinder-base.yaml

@ -9,7 +9,7 @@ parameters:
description: The Cinder service's storage availability zone.
type: string
CinderPassword:
description: The password for the cinder service account, used by cinder-api.
description: The password for the cinder service and db account.
type: string
hidden: true
Debug:

14
deployment/nova/nova-compute-container-puppet.yaml

@ -271,6 +271,14 @@ parameters:
type: boolean
tags:
- role_specific
CinderPassword:
description: The password for the cinder service and db account.
type: string
hidden: true
KeystoneRegion:
type: string
default: 'regionOne'
description: Keystone region for endpoint
resources:
@ -414,6 +422,12 @@ outputs:
- {get_param: CephClientUserName}
tripleo::profile::base::nova::compute::cinder_nfs_backend: {get_param: CinderEnableNfsBackend}
rbd_persistent_storage: {get_param: CinderEnableRbdBackend}
nova::cinder::username: 'cinder'
nova::cinder::auth_type: 'v3password'
nova::cinder::project_name: 'service'
nova::cinder::password: {get_param: CinderPassword}
nova::cinder::auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
nova::cinder::region_name: {get_param: KeystoneRegion}
nova::compute::rbd::libvirt_rbd_secret_key: {get_param: CephClientKey}
nova::compute::rbd::libvirt_rbd_secret_uuid: {get_param: CephClusterFSID}
nova::compute::instance_usage_audit: true

Loading…
Cancel
Save