Browse Source

Update octavia playbooks parameters

StackAction no longer conditions generate_certs.
Forward OctaviaGenerateCerts to the playbooks and add StackAction value
as parameter, the need of creating certificates is now handled in the
ansible playbook.

Change-Id: I9aaeec1d9f8623cbd99b2f83254dda038651f0a2
Related-Bug: #1849548
(cherry picked from commit 648cde501e)
(cherry picked from commit 5f336195f6)
(cherry picked from commit 1eb954241b)
changes/11/746911/1
Gregory Thiemonge 6 months ago
parent
commit
90ca8ec219
1 changed files with 2 additions and 10 deletions
  1. +2
    -10
      docker/services/octavia/octavia-deployment-config.yaml

+ 2
- 10
docker/services/octavia/octavia-deployment-config.yaml View File

@@ -166,15 +166,6 @@ parameters:
type: string
default: 'service'

conditions:

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

resources:
default_key_pair:
type: OS::Nova::KeyPair
@@ -218,7 +209,7 @@ outputs:
ca_private_key_path: { get_param: OctaviaCaKeyFile }
ca_passphrase: { get_param: OctaviaCaKeyPassphrase }
client_cert_path: { get_param: OctaviaClientCertFile }
generate_certs: {if: [generate_certs, true, false]}
generate_certs: { get_param: OctaviaGenerateCerts }
mgmt_port_dev: { get_param: OctaviaMgmtPortDevName }
overcloud_password: { get_param: AdminPassword }
overcloud_project: 'admin'
@@ -226,3 +217,4 @@ outputs:
octavia_ansible_playbook: '/usr/share/tripleo-common/playbooks/octavia-files.yaml'
overcloud_pub_auth_uri: { get_param: [EndpointMap, KeystoneV3Public, uri] }
overcloud_int_auth_uri: { get_param: [EndpointMap, KeystoneInternal, uri] }
stack_action: { get_param: StackAction }

Loading…
Cancel
Save