openstack/tripleo-heat-templates
Code Issues Proposed changes

Ensure we use only /run instead of /var/run

Browse Source 
There is no real value using /var/run instead of /run, especially since
/var/run is a symlink to /run.

This patch also removes duplicated mounts due to this very symlink.

Change-Id: Iaced2ba676a4e4f651c67da082797cc1c1ffccd1
This commit is contained in:
Cédric Jeanneret 2020-06-18 09:55:14 +02:00 committed by Cédric Jeanneret (Tengu)
parent 1f9942fd75
commit e047d83142
13 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
View File

@ -108,7 +108,7 @@ outputs:
-
- /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
- /var/run/libvirt:/var/run/libvirt:ro
- /run/libvirt:/run/libvirt:ro
- /var/log/containers/ceilometer:/var/log/ceilometer:z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

12
deployment/database/redis-container-puppet.yaml
View File

@ -137,7 +137,7 @@ outputs:
merge: true
preserve_properties: true
permissions:
- path: /var/run/redis
- path: /run/redis
owner: redis:redis
recurse: true
/var/lib/kolla/config_files/redis_tls_proxy.json:
@ -169,7 +169,7 @@ outputs:
restart: always
systemd_exec_flags:
RuntimeDirectory: redis
ExecStartPre: /bin/chcon -t container_file_t /var/run/redis
ExecStartPre: /bin/chcon -t container_file_t /run/redis
healthcheck:
test: /openstack/healthcheck
volumes:
@ -178,7 +178,7 @@ outputs:
- /var/lib/config-data/puppet-generated/redis:/var/lib/kolla/config_files/src:ro
- /etc/localtime:/etc/localtime:ro
- /var/log/containers/redis:/var/log/redis:z
- /var/run/redis:/var/run/redis:z
- /run/redis:/run/redis:z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
- if:
@ -222,12 +222,12 @@ outputs:
mode: "{{ item.mode|default(omit) }}"
with_items:
- { 'path': /var/log/containers/redis, 'setype': container_file_t, 'mode': '0750' }
- { 'path': /var/run/redis, 'setype': container_file_t }
- name: ensure /var/run/redis is present upon reboot
- { 'path': /run/redis, 'setype': container_file_t }
- name: ensure /run/redis is present upon reboot
copy:
dest: /etc/tmpfiles.d/var-run-redis.conf
content: |
d /var/run/redis 0755 root root - -
d /run/redis 0755 root root - -
update_tasks:
- name: Ensure redis is uninstalled on container host
when: step|int == 1

8
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -196,7 +196,7 @@ outputs:
preserve_properties: true
optional: true
permissions:
- path: /var/run/redis
- path: /run/redis
owner: redis:redis
recurse: true
- path: /var/lib/redis
@ -305,12 +305,12 @@ outputs:
with_items:
- { 'path': /var/lib/redis, 'setype': container_file_t }
- { 'path': /var/log/containers/redis, 'setype': container_file_t, 'mode': '0750' }
- { 'path': /var/run/redis, 'setype': container_file_t }
- name: ensure /var/run/redis is present upon reboot
- { 'path': /run/redis, 'setype': container_file_t }
- name: ensure /run/redis is present upon reboot
copy:
dest: /etc/tmpfiles.d/var-run-redis.conf
content: |
d /var/run/redis 0755 root root - -
d /run/redis 0755 root root - -
deploy_steps_tasks:
- name: Redis tag container image for pacemaker
when: step|int == 1

2
deployment/manila/manila-share-common.yaml
View File

@ -68,7 +68,7 @@ outputs:
- cephfs_nfs_enabled
-
- /etc/ganesha:/etc/ganesha
- /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
- /run/dbus/system_bus_socket:/run/dbus/system_bus_socket
- null
manila_share_environment:

4
deployment/metrics/collectd-container-puppet.yaml
View File

@ -428,7 +428,7 @@ outputs:
collectd::minimum_version: "5.7"
collectd::interval: {get_param: CollectdDefaultPollingInterval}
collectd::plugin::unixsock::socketgroup: root
collectd::plugin::unixsock::socketfile: /var/run/collectd-socket
collectd::plugin::unixsock::socketfile: /run/collectd-socket
collectd::plugin::unixsock::deletesocket: true
collectd::plugin::cpu::reportbycpu: true
collectd::plugin::cpu::reportbystate: true
@ -685,7 +685,7 @@ outputs:
- /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/collectd:/var/lib/kolla/config_files/src:ro
- /var/log/containers/collectd:/var/log/collectd:rw,z
- /var/run/:/var/run:rw
- /run/:/run:rw
- /sys/fs/cgroup:/sys/fs/cgroup:ro
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

2
deployment/mistral/mistral-executor-container-puppet.yaml
View File

@ -135,7 +135,7 @@ outputs:
-
if:
- docker_enabled
- - /var/run/docker.sock:/var/run/docker.sock:rw
- - /run/docker.sock:/run/docker.sock:rw
- null
kolla_config:
/var/lib/kolla/config_files/mistral_executor.json:

5
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -251,8 +251,8 @@ outputs:
tripleo.collectd.plugins.neutron_ovs_agent:
- ovs_events
- ovs_stats
collectd::plugin::ovs_events::socket: '/var/run/openvswitch/db.sock'
collectd::plugin::ovs_stats::socket: '/var/run/openvswitch/db.sock'
collectd::plugin::ovs_events::socket: '/run/openvswitch/db.sock'
collectd::plugin::ovs_stats::socket: '/run/openvswitch/db.sock'
puppet_config:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
@ -331,7 +331,6 @@ outputs:
- /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run/openvswitch:/run/openvswitch:shared,z
- /var/run/openvswitch/:/var/run/openvswitch/:shared,z
-
if:
- docker_puppet_mount_host

12
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -680,7 +680,7 @@ outputs:
- /dev:/dev
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /var/run/libvirt:/var/run/libvirt:shared,z
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/qemu:/etc/libvirt/qemu:ro
- /var/log/libvirt/qemu:/var/log/libvirt/qemu
@ -715,7 +715,7 @@ outputs:
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /etc/libvirt:/etc/libvirt
- /var/run/libvirt:/var/run/libvirt:shared,z
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/libvirt:/var/lib/libvirt:shared,z
- /var/log/libvirt/qemu:/var/log/libvirt/qemu:ro
- /var/lib/vhost_sockets:/var/lib/vhost_sockets:z
@ -797,7 +797,7 @@ outputs:
-
- /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova:/etc/nova:ro
- /etc/libvirt:/etc/libvirt
- /var/run/libvirt:/var/run/libvirt:shared,z
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/libvirt:/var/lib/libvirt:shared,z
command:
- /bin/bash
@ -839,7 +839,7 @@ outputs:
- { 'path': /etc/libvirt/qemu, 'setype': container_file_t }
- { 'path': /var/lib/libvirt, 'setype': container_file_t }
- { 'path': /var/lib/nova, 'setype': container_file_t }
- { 'path': /var/run/libvirt, 'setype': virt_var_run_t }
- { 'path': /run/libvirt, 'setype': virt_var_run_t }
- { 'path': /var/log/libvirt, 'setype': container_file_t }
- { 'path': /var/log/libvirt/qemu, 'setype': container_file_t }
# qemu user on host will be cretaed by libvirt package install, ensure
@ -888,11 +888,11 @@ outputs:
- libvirtd.service
- virtlogd.socket
when: libvirt_installed.rc == 0
- name: ensure /var/run/libvirt is present upon reboot
- name: ensure /run/libvirt is present upon reboot
copy:
dest: /etc/tmpfiles.d/var-run-libvirt.conf
content: |
d /var/run/libvirt 0755 root root - -
d /run/libvirt 0755 root root - -
metadata_settings:
list_concat:
- if:

8
deployment/nova/nova-migration-target-container-puppet.yaml
View File

@ -153,12 +153,12 @@ outputs:
state: directory
setype: "{{ item.setype }}"
loop:
- { 'path': /var/run/libvirt, 'setype': virt_var_run_t }
- name: ensure /var/run/libvirt is present upon reboot
- { 'path': /run/libvirt, 'setype': virt_var_run_t }
- name: ensure /run/libvirt is present upon reboot
copy:
dest: /etc/tmpfiles.d/var-run-libvirt.conf
content: |
d /var/run/libvirt 0755 root root - -
d /run/libvirt 0755 root root - -
docker_config:
step_4:
nova_migration_target:
@ -176,7 +176,7 @@ outputs:
- /var/lib/kolla/config_files/nova-migration-target.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro
- /etc/ssh/:/host-ssh/:ro
- /var/run/libvirt:/var/run/libvirt:shared,z
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/nova:/var/lib/nova:shared
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

10
deployment/octavia/octavia-api-container-puppet.yaml
View File

@ -346,7 +346,7 @@ outputs:
- /var/lib/kolla/config_files/octavia_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro
- /var/log/containers/octavia:/var/log/octavia:z
- /var/run/octavia:/var/run/octavia:shared,z
- /run/octavia:/run/octavia:shared,z
- /var/log/containers/httpd/octavia-api:/var/log/httpd:z
- if:
- internal_tls_enabled
@ -374,7 +374,7 @@ outputs:
- /var/lib/kolla/config_files/octavia_driver_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/octavia:/var/lib/kolla/config_files/src:ro
- /var/log/containers/octavia:/var/log/octavia:z
- /var/run/octavia:/var/run/octavia:shared,z
- /run/octavia:/run/octavia:shared,z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
- {}
@ -389,12 +389,12 @@ outputs:
with_items:
- { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
- { 'path': /var/log/containers/httpd/octavia-api, 'setype': container_file_t, 'mode': '0750' }
- { 'path': /var/run/octavia, 'setype': container_file_t, 'mode': '0755' }
- name: ensure /var/run/octavia is present upon reboot
- { 'path': /run/octavia, 'setype': container_file_t, 'mode': '0755' }
- name: ensure /run/octavia is present upon reboot
copy:
dest: /etc/tmpfiles.d/var-run-octavia.conf
content: |
d /var/run/octavia 0755 root root - -
d /run/octavia 0755 root root - -
update_tasks:
- name: Set internal tls variable
set_fact:

2
deployment/swift/swift-storage-container-puppet.yaml
View File

@ -656,7 +656,7 @@ outputs:
update_tasks:
- name: Ensure rsyncd pid file is absent
file:
path: /var/run/rsyncd.pid
path: /run/rsyncd.pid
state: absent
- name: Check swift containers log folder/symlink exists
stat:

2
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

@ -460,7 +460,7 @@ outputs:
- ansible_distribution == 'RedHat'
- not (skip_rhel_enforcement | bool)
- name: Check for existing yum.pid
stat: path=/var/run/yum.pid
stat: path=/run/yum.pid
register: yum_pid_file
when: step|int == 0 or step|int == 3
- name: Exit if existing yum process

4
releasenotes/notes/converge-var_run-to-run-20286a74e780e999.yaml Normal file
View File

@ -0,0 +1,4 @@
---
other:
- |
Ensure we're using only /run location, since /var/run is a symlink to /run