Create post-deploy.conf on update/upgrade for octavia

Containers are restarted with new command lines during upgrade/updates
before the external_deploy_task are run that create a configuration file
that is used on the command line. This results in octavia services
failing to start.

Change-Id: I741059afad42d0aa1e17b5becd56cbbbb0003c82
Related-Bug: #1863595
This commit is contained in:
Brent Eagles 2020-09-10 10:37:57 -02:30
parent cc797b648b
commit d3826e9ec3
5 changed files with 76 additions and 52 deletions

View File

@ -403,7 +403,9 @@ outputs:
content: |
d /run/octavia 0755 root root - -
update_tasks:
- name: octavia_api_tmpfile_cleanup
list_concat:
- {get_attr: [OctaviaBase, update_tasks]}
- - name: octavia_api_tmpfile_cleanup
when: step|int == 1
block: &octavia_api_tmpfile_cleanup
- name: octavia_api_tmpfile_cleanup
@ -444,8 +446,11 @@ outputs:
- name: reload systemd
systemd:
daemon-reload: yes
upgrade_tasks:
- name: octavia_api_tmpfile_cleanup
list_concat:
- {get_attr: [OctaviaBase, upgrade_tasks]}
- - name: octavia_api_tmpfile_cleanup
when: step|int == 1
block: *octavia_api_tmpfile_cleanup
- name: Set internal tls variable

View File

@ -308,3 +308,19 @@ outputs:
- octavia_client_cert_unset
- {}
- octavia::certificates::client_cert_data: {get_param: OctaviaClientCert}
update_tasks: &ensure_start_up_files
- name: make sure that post-deploy.conf exists before restarting containers on update or upgrade
block:
- name: check for octavia post-deploy.conf file
stat:
path: /var/lib/config-data/puppet-generated/octavia/etc/octavia/post-deploy.conf
register: octavia_post_deploy_stat
- name: create an empty post-deploy.conf file if it does not exist
file:
path: /var/lib/config-data/puppet-generated/octavia/etc/octavia/post-deploy.conf
state: touch
setype: container_file_t
mode: '0755'
when:
- octavia_post_deploy_stat.exists is defined and not octavia_post_deploy_stat.exists
upgrade_tasks: *ensure_start_up_files

View File

@ -195,7 +195,8 @@ outputs:
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
- {}
update_tasks: {get_attr: [OctaviaBase, update_tasks]}
upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}
host_prep_tasks:
- name: create persistent directories
file:

View File

@ -147,6 +147,8 @@ outputs:
- /var/log/containers/octavia:/var/log/octavia:z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
update_tasks: {get_attr: [OctaviaBase, update_tasks]}
upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}
host_prep_tasks:
- name: create persistent directories
file:
@ -156,4 +158,3 @@ outputs:
mode: "{{ item.mode }}"
with_items:
- { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
upgrade_tasks: []

View File

@ -167,4 +167,5 @@ outputs:
name: virt_sandbox_use_netlink
persistent: yes
state: yes
upgrade_tasks: []
update_tasks: {get_attr: [OctaviaBase, update_tasks]}
upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}