Browse Source

Merge "Only generate Octavia certs on stack create" into stable/queens

changes/48/690048/1
Zuul Gerrit Code Review 7 months ago
parent
commit
2e91eebae3
1 changed files with 15 additions and 1 deletions
  1. +15
    -1
      docker/services/octavia/octavia-deployment-config.yaml

+ 15
- 1
docker/services/octavia/octavia-deployment-config.yaml View File

@@ -30,6 +30,13 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
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:
description: Mistral workflow name for octavia configuration steps
once the overcloud is ready.
@@ -159,6 +166,13 @@ parameters:
type: string
default: 'service'

generate_certs:
and:
- get_param: OctaviaGenerateCerts
- equals:
- get_param: StackAction
- CREATE

resources:
default_key_pair:
type: OS::Nova::KeyPair
@@ -202,7 +216,7 @@ outputs:
ca_private_key_path: { get_param: OctaviaCaKeyFile }
ca_passphrase: { get_param: OctaviaCaKeyPassphrase }
client_cert_path: { get_param: OctaviaClientCertFile }
generate_certs: { get_param: OctaviaGenerateCerts }
generate_certs: {if: [generate_certs, true, false]}
mgmt_port_dev: { get_param: OctaviaMgmtPortDevName }
overcloud_password: { get_param: AdminPassword }
overcloud_project: 'admin'


Loading…
Cancel
Save