Merge "Ensure name consistency for tmpfiles.d configurations"
This commit is contained in:
commit
9dc74f9219
|
@ -89,7 +89,7 @@ outputs:
|
||||||
- - block:
|
- - block:
|
||||||
- name: Check for docker cli
|
- name: Check for docker cli
|
||||||
stat:
|
stat:
|
||||||
path: "/var/run/docker.sock"
|
path: "/run/docker.sock"
|
||||||
register: check_docker_cli
|
register: check_docker_cli
|
||||||
check_mode: false
|
check_mode: false
|
||||||
- name: Set noout flag
|
- name: Set noout flag
|
||||||
|
|
|
@ -221,21 +221,31 @@ outputs:
|
||||||
- { 'path': /run/redis, 'setype': container_file_t }
|
- { 'path': /run/redis, 'setype': container_file_t }
|
||||||
- name: ensure /run/redis is present upon reboot
|
- name: ensure /run/redis is present upon reboot
|
||||||
copy:
|
copy:
|
||||||
dest: /etc/tmpfiles.d/var-run-redis.conf
|
dest: /etc/tmpfiles.d/run-redis.conf
|
||||||
content: |
|
content: |
|
||||||
d /run/redis 0755 root root - -
|
d /run/redis 0755 root root - -
|
||||||
update_tasks:
|
update_tasks:
|
||||||
- name: Ensure redis is uninstalled on container host
|
- name: redis_container_puppet_redis_pkg_clean
|
||||||
when: step|int == 1
|
when: step|int == 1
|
||||||
package:
|
block: &redis_container_puppet_redis_pkg_clean
|
||||||
name: redis
|
- name: Ensure redis is uninstalled on container host
|
||||||
state: absent
|
package:
|
||||||
|
name: redis
|
||||||
|
state: absent
|
||||||
|
- name: redis_container_puppet_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: &redis_container_puppet_tmpfile_cleanup
|
||||||
|
- name: remove old tmpfiles.d config
|
||||||
|
file:
|
||||||
|
path: /etc/tmpfiles.d/var-run-redis.conf
|
||||||
|
state: absent
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
- name: Ensure redis is uninstalled on container host
|
- name: redis_container_puppet_redis_pkg_clean
|
||||||
when: step|int == 1
|
when: step|int == 1
|
||||||
package:
|
block: *redis_container_puppet_redis_pkg_clean
|
||||||
name: redis
|
- name: redis_container_puppet_tmpfile_cleanup
|
||||||
state: absent
|
when: step|int == 1
|
||||||
|
block: *redis_container_puppet_tmpfile_cleanup
|
||||||
external_upgrade_tasks:
|
external_upgrade_tasks:
|
||||||
- when:
|
- when:
|
||||||
- step|int == 1
|
- step|int == 1
|
||||||
|
|
|
@ -258,7 +258,7 @@ outputs:
|
||||||
- { 'path': /run/redis, 'setype': container_file_t }
|
- { 'path': /run/redis, 'setype': container_file_t }
|
||||||
- name: ensure /run/redis is present upon reboot
|
- name: ensure /run/redis is present upon reboot
|
||||||
copy:
|
copy:
|
||||||
dest: /etc/tmpfiles.d/var-run-redis.conf
|
dest: /etc/tmpfiles.d/run-redis.conf
|
||||||
content: |
|
content: |
|
||||||
d /run/redis 0755 root root - -
|
d /run/redis 0755 root root - -
|
||||||
deploy_steps_tasks:
|
deploy_steps_tasks:
|
||||||
|
@ -285,6 +285,13 @@ outputs:
|
||||||
tripleo_ha_wrapper_puppet_tags: 'pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation'
|
tripleo_ha_wrapper_puppet_tags: 'pacemaker::resource::bundle,pacemaker::property,pacemaker::resource::ocf,pacemaker::constraint::order,pacemaker::constraint::colocation'
|
||||||
tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}
|
tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}
|
||||||
update_tasks:
|
update_tasks:
|
||||||
|
- name: redis_pacemaker_puppet_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: &redis_pacemaker_puppet_tmpfile_cleanup
|
||||||
|
- name: Clean old tmpfile configuration
|
||||||
|
file:
|
||||||
|
path: /etc/tmpfiles.d/var-run-redis.conf
|
||||||
|
state: absent
|
||||||
- name: Tear-down non-HA redis container
|
- name: Tear-down non-HA redis container
|
||||||
when:
|
when:
|
||||||
- step|int == 1
|
- step|int == 1
|
||||||
|
@ -333,6 +340,9 @@ outputs:
|
||||||
tripleo_ha_wrapper_minor_update: true
|
tripleo_ha_wrapper_minor_update: true
|
||||||
|
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
- name: redis_pacemaker_puppet_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: *redis_pacemaker_puppet_tmpfile_cleanup
|
||||||
- name: Tear-down non-HA redis container
|
- name: Tear-down non-HA redis container
|
||||||
when:
|
when:
|
||||||
- step|int == 0
|
- step|int == 0
|
||||||
|
|
|
@ -901,7 +901,7 @@ outputs:
|
||||||
when: libvirt_installed.rc == 0
|
when: libvirt_installed.rc == 0
|
||||||
- name: ensure /run/libvirt is present upon reboot
|
- name: ensure /run/libvirt is present upon reboot
|
||||||
copy:
|
copy:
|
||||||
dest: /etc/tmpfiles.d/var-run-libvirt.conf
|
dest: /etc/tmpfiles.d/run-libvirt.conf
|
||||||
content: |
|
content: |
|
||||||
d /run/libvirt 0755 root root - -
|
d /run/libvirt 0755 root root - -
|
||||||
metadata_settings:
|
metadata_settings:
|
||||||
|
@ -927,4 +927,15 @@ outputs:
|
||||||
network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
|
network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
|
||||||
type: node
|
type: node
|
||||||
- null
|
- null
|
||||||
upgrade_tasks: []
|
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
|
||||||
|
update_tasks:
|
||||||
|
- name: nova_libvirt_container_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: *nova_libvirt_container_tmpfile_cleanup
|
||||||
|
|
|
@ -156,7 +156,7 @@ outputs:
|
||||||
- { 'path': /run/libvirt, 'setype': virt_var_run_t }
|
- { 'path': /run/libvirt, 'setype': virt_var_run_t }
|
||||||
- name: ensure /run/libvirt is present upon reboot
|
- name: ensure /run/libvirt is present upon reboot
|
||||||
copy:
|
copy:
|
||||||
dest: /etc/tmpfiles.d/var-run-libvirt.conf
|
dest: /etc/tmpfiles.d/run-libvirt.conf
|
||||||
content: |
|
content: |
|
||||||
d /run/libvirt 0755 root root - -
|
d /run/libvirt 0755 root root - -
|
||||||
docker_config:
|
docker_config:
|
||||||
|
@ -197,3 +197,15 @@ outputs:
|
||||||
- container_cli == 'podman'
|
- container_cli == 'podman'
|
||||||
- not container_healthcheck_disabled
|
- not container_healthcheck_disabled
|
||||||
- step|int == 5
|
- step|int == 5
|
||||||
|
update_tasks:
|
||||||
|
- name: nova_migration_target_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: &nova_migration_target_tmpfile_cleanup
|
||||||
|
- name: Remove old tmpfiles.d config
|
||||||
|
file:
|
||||||
|
path: /etc/tmpfiles.d/var-run-libvirt.conf
|
||||||
|
state: absent
|
||||||
|
upgrade_tasks:
|
||||||
|
- name: nova_migration_target_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: *nova_migration_target_tmpfile_cleanup
|
||||||
|
|
|
@ -398,10 +398,17 @@ outputs:
|
||||||
- { 'path': /run/octavia, 'setype': container_file_t, 'mode': '0755' }
|
- { 'path': /run/octavia, 'setype': container_file_t, 'mode': '0755' }
|
||||||
- name: ensure /run/octavia is present upon reboot
|
- name: ensure /run/octavia is present upon reboot
|
||||||
copy:
|
copy:
|
||||||
dest: /etc/tmpfiles.d/var-run-octavia.conf
|
dest: /etc/tmpfiles.d/run-octavia.conf
|
||||||
content: |
|
content: |
|
||||||
d /run/octavia 0755 root root - -
|
d /run/octavia 0755 root root - -
|
||||||
update_tasks:
|
update_tasks:
|
||||||
|
- name: octavia_api_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: &octavia_api_tmpfile_cleanup
|
||||||
|
- name: octavia_api_tmpfile_cleanup
|
||||||
|
file:
|
||||||
|
path: /etc/tmpfiles.d/var-run-octavia.conf
|
||||||
|
state: absent
|
||||||
- name: Set internal tls variable
|
- name: Set internal tls variable
|
||||||
set_fact:
|
set_fact:
|
||||||
internal_tls_enabled: {get_param: EnableInternalTLS}
|
internal_tls_enabled: {get_param: EnableInternalTLS}
|
||||||
|
@ -437,6 +444,9 @@ outputs:
|
||||||
systemd:
|
systemd:
|
||||||
daemon-reload: yes
|
daemon-reload: yes
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
- name: octavia_api_tmpfile_cleanup
|
||||||
|
when: step|int == 1
|
||||||
|
block: *octavia_api_tmpfile_cleanup
|
||||||
- name: Set internal tls variable
|
- name: Set internal tls variable
|
||||||
set_fact:
|
set_fact:
|
||||||
internal_tls_enabled: {get_param: EnableInternalTLS}
|
internal_tls_enabled: {get_param: EnableInternalTLS}
|
||||||
|
|
Loading…
Reference in New Issue