Merge "Only generate Octavia certs on stack create" into stable/queens
This commit is contained in:
commit
2e91eebae3
|
@ -30,6 +30,13 @@ parameters:
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
|
StackAction:
|
||||||
|
type: string
|
||||||
|
description: >
|
||||||
|
Heat action on performed top-level stack. Note StackUpdateType is
|
||||||
|
set to UPGRADE when a major-version upgrade is in progress.
|
||||||
|
constraints:
|
||||||
|
- allowed_values: ['CREATE', 'UPDATE']
|
||||||
OctaviaPostWorkflowName:
|
OctaviaPostWorkflowName:
|
||||||
description: Mistral workflow name for octavia configuration steps
|
description: Mistral workflow name for octavia configuration steps
|
||||||
once the overcloud is ready.
|
once the overcloud is ready.
|
||||||
|
@ -159,6 +166,13 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: 'service'
|
default: 'service'
|
||||||
|
|
||||||
|
generate_certs:
|
||||||
|
and:
|
||||||
|
- get_param: OctaviaGenerateCerts
|
||||||
|
- equals:
|
||||||
|
- get_param: StackAction
|
||||||
|
- CREATE
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
default_key_pair:
|
default_key_pair:
|
||||||
type: OS::Nova::KeyPair
|
type: OS::Nova::KeyPair
|
||||||
|
@ -202,7 +216,7 @@ outputs:
|
||||||
ca_private_key_path: { get_param: OctaviaCaKeyFile }
|
ca_private_key_path: { get_param: OctaviaCaKeyFile }
|
||||||
ca_passphrase: { get_param: OctaviaCaKeyPassphrase }
|
ca_passphrase: { get_param: OctaviaCaKeyPassphrase }
|
||||||
client_cert_path: { get_param: OctaviaClientCertFile }
|
client_cert_path: { get_param: OctaviaClientCertFile }
|
||||||
generate_certs: { get_param: OctaviaGenerateCerts }
|
generate_certs: {if: [generate_certs, true, false]}
|
||||||
mgmt_port_dev: { get_param: OctaviaMgmtPortDevName }
|
mgmt_port_dev: { get_param: OctaviaMgmtPortDevName }
|
||||||
overcloud_password: { get_param: AdminPassword }
|
overcloud_password: { get_param: AdminPassword }
|
||||||
overcloud_project: 'admin'
|
overcloud_project: 'admin'
|
||||||
|
|
Loading…
Reference in New Issue