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)
This commit is contained in:
Gregory Thiemonge 2020-03-25 17:11:11 +01:00
parent 12a6838ca1
commit 1eb954241b
1 changed files with 2 additions and 8 deletions

View File

@ -204,13 +204,6 @@ conditions:
- raw - raw
- get_param: NovaEnableRbdBackend - get_param: NovaEnableRbdBackend
generate_certs:
and:
- get_param: OctaviaGenerateCerts
- equals:
- get_param: StackAction
- CREATE
resources: resources:
{% if not octavia_standalone %} {% if not octavia_standalone %}
default_key_pair: default_key_pair:
@ -251,7 +244,7 @@ resources:
server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase} server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase}
ca_passphrase: { get_param: OctaviaCaKeyPassphrase } ca_passphrase: { get_param: OctaviaCaKeyPassphrase }
client_cert_path: { get_param: OctaviaClientCertFile } client_cert_path: { get_param: OctaviaClientCertFile }
generate_certs: {if: [generate_certs, true, false]} generate_certs: { get_param: OctaviaGenerateCerts }
mgmt_port_dev: { get_param: OctaviaMgmtPortDevName } mgmt_port_dev: { get_param: OctaviaMgmtPortDevName }
os_password: { get_param: AdminPassword } os_password: { get_param: AdminPassword }
os_project_name: 'admin' os_project_name: 'admin'
@ -263,6 +256,7 @@ resources:
octavia_group_vars_dir: "{{playbook_dir}}/octavia-ansible/group_vars" octavia_group_vars_dir: "{{playbook_dir}}/octavia-ansible/group_vars"
container_cli: { get_param: ContainerCli } container_cli: { get_param: ContainerCli }
enable_log_offloading: { get_param: OctaviaLogOffload } enable_log_offloading: { get_param: OctaviaLogOffload }
stack_action: { get_param: StackAction }
outputs: outputs:
role_data: role_data: