openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add missing region_name for Octavia service_auth"

Browse Source
This commit is contained in:
Zuul 2020-02-19 06:31:29 +00:00 committed by Gerrit Code Review
commit d408b0f37d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/octavia/octavia-base.yaml
View File

@ -67,6 +67,10 @@ parameters:
description: The project name for the keystone Octavia account. description: The project name for the keystone Octavia account.
type: string type: string
default: 'service' default: 'service'
KeystoneRegion:
type: string
default: 'regionOne'
description: Keystone region for endpoint
OctaviaCaCertFile: OctaviaCaCertFile:
type: string type: string
default: '/etc/octavia/certs/ca_01.pem' default: '/etc/octavia/certs/ca_01.pem'
@ -246,6 +250,7 @@ outputs:
octavia::service_auth::project_name: {get_param: OctaviaProjectName} octavia::service_auth::project_name: {get_param: OctaviaProjectName}
octavia::service_auth::project_domain_name: 'Default' octavia::service_auth::project_domain_name: 'Default'
octavia::service_auth::user_domain_name: 'Default' octavia::service_auth::user_domain_name: 'Default'
octavia::service_auth::region_name: {get_param: KeystoneRegion}
octavia::certificates::ca_certificate: {get_param: OctaviaCaCertFile} octavia::certificates::ca_certificate: {get_param: OctaviaCaCertFile}
octavia::certificates::ca_private_key: {get_param: OctaviaCaKeyFile} octavia::certificates::ca_private_key: {get_param: OctaviaCaKeyFile}
octavia::certificates::server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase} octavia::certificates::server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase}