Merge "Use different name to distinguish between facts and vars in octavia" into stable/train
This commit is contained in:
commit
f7e4c9a6f8
@ -79,9 +79,9 @@
|
|||||||
octavia_confd_prefix: "/var/lib/config-data/puppet-generated/octavia"
|
octavia_confd_prefix: "/var/lib/config-data/puppet-generated/octavia"
|
||||||
lb_mgmt_net_id: "{{ hostvars[groups['octavia_nodes'][0]]['lb_mgmt_net_id'] }}"
|
lb_mgmt_net_id: "{{ hostvars[groups['octavia_nodes'][0]]['lb_mgmt_net_id'] }}"
|
||||||
lb_mgmt_secgroup_id: "{{ hostvars[groups['octavia_nodes'][0]]['lb_mgmt_secgroup_id'] }}"
|
lb_mgmt_secgroup_id: "{{ hostvars[groups['octavia_nodes'][0]]['lb_mgmt_secgroup_id'] }}"
|
||||||
private_key_content: "{{ hostvars[groups['octavia_nodes'][0]]['private_key_content'] | default('') }}"
|
updated_private_key_content: "{{ hostvars[groups['octavia_nodes'][0]]['private_key_content'] | default('') }}"
|
||||||
ca_cert_content: "{{ hostvars[groups['octavia_nodes'][0]]['ca_cert_content'] | default('') }}"
|
updated_ca_cert_content: "{{ hostvars[groups['octavia_nodes'][0]]['ca_cert_content'] | default('') }}"
|
||||||
service_pem_content: "{{ hostvars[groups['octavia_nodes'][0]]['service_pem_content'] | default('') }}"
|
updated_service_pem_content: "{{ hostvars[groups['octavia_nodes'][0]]['service_pem_content'] | default('') }}"
|
||||||
update_certs: "{{ hostvars[groups['octavia_nodes'][0]]['update_certs'] | default(true) }}"
|
update_certs: "{{ hostvars[groups['octavia_nodes'][0]]['update_certs'] | default(true) }}"
|
||||||
generate_certs: "{{ generate_certs }}"
|
generate_certs: "{{ generate_certs }}"
|
||||||
ca_cert_path: "{{ ca_cert_path }}"
|
ca_cert_path: "{{ ca_cert_path }}"
|
||||||
|
@ -17,11 +17,11 @@
|
|||||||
setype: svirt_sandbox_file_t
|
setype: svirt_sandbox_file_t
|
||||||
no_log: true
|
no_log: true
|
||||||
loop:
|
loop:
|
||||||
- content: "{{ private_key_content }}"
|
- content: "{{ updated_private_key_content }}"
|
||||||
path: "{{ ca_private_key_path }}"
|
path: "{{ ca_private_key_path }}"
|
||||||
- content: "{{ ca_cert_content }}"
|
- content: "{{ updated_ca_cert_content }}"
|
||||||
path: "{{ ca_cert_path }}"
|
path: "{{ ca_cert_path }}"
|
||||||
- content: "{{ service_pem_content }}"
|
- content: "{{ updated_service_pem_content }}"
|
||||||
path: "{{ client_cert_path }}"
|
path: "{{ client_cert_path }}"
|
||||||
notify:
|
notify:
|
||||||
- octavia config updated
|
- octavia config updated
|
||||||
|
Loading…
Reference in New Issue
Block a user