Browse Source

Merge "Update octavia playbooks parameters" into stable/train

changes/61/745761/1
Zuul 12 months ago
committed by Gerrit Code Review
parent
commit
ecb3ea6939
  1. 10
      deployment/octavia/octavia-deployment-config.j2.yaml

10
deployment/octavia/octavia-deployment-config.j2.yaml

@ -204,13 +204,6 @@ conditions:
- raw
- get_param: NovaEnableRbdBackend
generate_certs:
and:
- get_param: OctaviaGenerateCerts
- equals:
- get_param: StackAction
- CREATE
resources:
{% if not octavia_standalone %}
default_key_pair:
@ -251,7 +244,7 @@ resources:
server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase}
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 }
os_password: { get_param: AdminPassword }
os_project_name: 'admin'
@ -263,6 +256,7 @@ resources:
octavia_group_vars_dir: "{{playbook_dir}}/octavia-ansible/group_vars"
container_cli: { get_param: ContainerCli }
enable_log_offloading: { get_param: OctaviaLogOffload }
stack_action: { get_param: StackAction }
outputs:
role_data:

Loading…
Cancel
Save