From 90ca8ec219eaa97d0d00a8b4e10ffd1e2b418360 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Wed, 25 Mar 2020 17:11:11 +0100 Subject: [PATCH] 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 648cde501eb31766ed333f48ac1f6a4854b26c41) (cherry picked from commit 5f336195f622c0191eb7cc432ff49a81a9d97e3b) (cherry picked from commit 1eb954241bb4988e9ab6a9a74f0d277fe33726d6) --- .../services/octavia/octavia-deployment-config.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml index 2909feef6b..6e1dfd507c 100644 --- a/docker/services/octavia/octavia-deployment-config.yaml +++ b/docker/services/octavia/octavia-deployment-config.yaml @@ -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 }