openstack/tripleo-ansible
Code Issues Proposed changes

Use different name to distinguish between facts and vars in octavia

Browse Source 
ansible facts take precedence over vars in ansible apparently so octavia
controller configuration did not properly update certificates on hosts.

Closes-Bug: #1939445
Change-Id: I42e8993825c9ed956543755daf8cb6e414b1d790
This commit is contained in:
Brent Eagles
2021-08-10 16:56:34 -02:30
parent 401f55d8f2
commit 6d4ee79d28
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_ansible/playbooks/octavia-files.yaml
View File

@@ -79,9 +79,9 @@
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_secgroup_id: "{{ hostvars[groups['octavia_nodes'][0]]['lb_mgmt_secgroup_id'] }}"
private_key_content: "{{ hostvars[groups['octavia_nodes'][0]]['private_key_content'] | default('') }}"
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_private_key_content: "{{ hostvars[groups['octavia_nodes'][0]]['private_key_content'] | default('') }}"
updated_ca_cert_content: "{{ hostvars[groups['octavia_nodes'][0]]['ca_cert_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) }}"
generate_certs: "{{ generate_certs }}"
ca_cert_path: "{{ ca_cert_path }}"

6
tripleo_ansible/roles/octavia_controller_config/tasks/certificate.yml
View File

@@ -17,11 +17,11 @@
setype: svirt_sandbox_file_t
no_log: "{{ octavia_controller_config_hide_sensitive_logs | bool }}"
loop:
- content: "{{ private_key_content }}"
- content: "{{ updated_private_key_content }}"
path: "{{ ca_private_key_path }}"
- content: "{{ ca_cert_content }}"
- content: "{{ updated_ca_cert_content }}"
path: "{{ ca_cert_path }}"
- content: "{{ service_pem_content }}"
- content: "{{ updated_service_pem_content }}"
path: "{{ client_cert_path }}"
notify:
- octavia config updated