openstack/tripleo-heat-templates
Code Issues Proposed changes

[ffwd3] Update virtlogd image during system upgrade

Browse Source 
During system upgrade we need to ensure virtlogd image
will be updated so the system starts with correct one
after reboot. The nova_virtlogd contianer is started by
the nova_virtlogd_wrapper and the actual image to be used
is set in /var/lib/container-config-scripts/virtlogd_wrapper

Also modular libvirt has wrong systemd service dependancy
set when using virtlogd_wrapper

Change-Id: I9bf2be46c1edf62ee7700c295c54153adfa5b7e3
Resolves: rhbz#2228818
This commit is contained in:
Lukas Bezdicka 2023-09-06 15:36:02 +02:00
parent 31f6a601b8
commit e103a57404
2 changed files with 68 additions and 24 deletions

38
deployment/deprecated/nova/nova-libvirt-container-puppet.yaml

@ -966,13 +966,37 @@ outputs:
network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
type: node
upgrade_tasks:
- name: nova_libvirt_container_tmpfile_cleanup
when: step|int == 1
block: &nova_libvirt_container_tmpfile_cleanup
- name: Remove old tmpfiles.d config
file:
path: /etc/tmpfiles.d/var-run-libvirt.conf
state: absent
list_concat:
- - name: nova_libvirt_container_tmpfile_cleanup
when: step|int == 1
block: &nova_libvirt_container_tmpfile_cleanup
- name: Remove old tmpfiles.d config
file:
path: /etc/tmpfiles.d/var-run-libvirt.conf
state: absent
- if:
- {get_param: NovaEnableVirtlogdContainerWrapper}
# This should be only in modular libvirt template but we better
# ensure the proper image even if user failed to switch templates
# while they run system upgrade
- - name: Switch virtlogd image before system upgrade
when: step|int == 1
tags:
- never
- system_upgrade
block:
- name: Get container virtlogd image
set_fact:
# container image to use for deployment
virtlogd_image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtImage]}
- name: Get running image version
shell: |
podman ps --filter name=^nova_virtlogd$ --format "{% raw %}{{ .Image }}{% endraw %}"
register: old_virtlogd_image
- name: Switch running image to new image in wrapper script
shell: |
sed -i -e 's/{{ old_virtlogd_image.stdout | regex_escape() }}/{{ virtlogd_image | regex_escape() }}/' /var/lib/container-config-scripts/virtlogd_wrapper
when: old_virtlogd_image.stdout != virtlogd_image
update_tasks:
- name: nova_libvirt_container_tmpfile_cleanup
when: step|int == 1

54
deployment/nova/nova-modular-libvirt-container-puppet.yaml

@ -605,8 +605,11 @@ outputs:
- label=type:spc_t
- label=filetype:container_share_t
restart: always
depends_on:
- tripleo_nova_virtlogd.service
depends_on: &virtlog_depends_on
- if:
- {get_param: NovaEnableVirtlogdContainerWrapper}
- tripleo_nova_virtlogd_wrapper.service
- tripleo_nova_virtlogd.service
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
volumes:
@ -630,8 +633,7 @@ outputs:
- label=type:spc_t
- label=filetype:container_share_t
restart: always
depends_on:
- tripleo_nova_virtlogd.service
depends_on: *virtlog_depends_on
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
volumes:
@ -655,8 +657,7 @@ outputs:
- label=type:spc_t
- label=filetype:container_share_t
restart: always
depends_on:
- tripleo_nova_virtlogd.service
depends_on: *virtlog_depends_on
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
volumes:
@ -680,8 +681,7 @@ outputs:
- label=type:spc_t
- label=filetype:container_share_t
restart: always
depends_on:
- tripleo_nova_virtlogd.service
depends_on: *virtlog_depends_on
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
volumes:
@ -706,8 +706,7 @@ outputs:
- label=type:spc_t
- label=filetype:container_share_t
restart: always
depends_on:
- tripleo_nova_virtlogd.service
depends_on: *virtlog_depends_on
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
volumes:
@ -1025,13 +1024,34 @@ outputs:
network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
type: node
upgrade_tasks:
- name: nova_libvirt_container_tmpfile_cleanup
when: step|int == 1
block: &nova_libvirt_container_tmpfile_cleanup
- name: Remove old tmpfiles.d config
file:
path: /etc/tmpfiles.d/var-run-libvirt.conf
state: absent
list_concat:
- - name: nova_libvirt_container_tmpfile_cleanup
when: step|int == 1
block: &nova_libvirt_container_tmpfile_cleanup
- name: Remove old tmpfiles.d config
file:
path: /etc/tmpfiles.d/var-run-libvirt.conf
state: absent
- if:
- {get_param: NovaEnableVirtlogdContainerWrapper}
- - name: Switch virtlogd image before system upgrade
when: step|int == 1
tags:
- never
- system_upgrade
block:
- name: Get container virtlogd image
set_fact:
# container image to use for deployment
virtlogd_image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtImage]}
- name: Get running image version
shell: |
podman ps --filter name=^nova_virtlogd$ --format "{% raw %}{{ .Image }}{% endraw %}"
register: old_virtlogd_image
- name: Switch running image to new image in wrapper script
shell: |
sed -i -e 's|{{ old_virtlogd_image.stdout }}|{{ virtlogd_image }}|' /var/lib/container-config-scripts/virtlogd_wrapper
when: old_virtlogd_image.stdout != virtlogd_image
update_tasks:
- name: nova_libvirt_container_tmpfile_cleanup
when: step|int == 1