8437f6c9cd
/var/run is mounted as a tmpfs, which means /var/run/redis
disappears on reboot. Since podman doesn't try to recreate a
directory if it doesn't exist, containerized redis cannot
be restarted because one of its bind mount is missing.
Force the creation of /var/run/redis after every reboot, with
default permissions. On container restart, Kolla will chown and
chmod the directory to the proper value.
Change-Id: I36c81f58c3b3e9366212a93f73b6212cca4ea569
Closes-Bug: #1826554
Depends-On: Iaa8a99eb9ced21fb6c7c87c5b56dec55383af9a9
(cherry picked from commit 75361e66b0)
262 lines
9.4 KiB
YAML
262 lines
9.4 KiB
YAML
heat_template_version: rocky
|
|
|
|
description: >
|
|
OpenStack containerized Redis services
|
|
|
|
parameters:
|
|
DockerRedisImage:
|
|
description: image
|
|
type: string
|
|
DockerRedisConfigImage:
|
|
description: The container image to use for the redis config_volume
|
|
type: string
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
EnableInternalTLS:
|
|
type: boolean
|
|
default: false
|
|
|
|
conditions:
|
|
|
|
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ../containers-common.yaml
|
|
|
|
RedisBase:
|
|
type: ./redis-base-puppet.yaml
|
|
properties:
|
|
EndpointMap: {get_param: EndpointMap}
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Redis API role.
|
|
value:
|
|
service_name: redis
|
|
config_settings:
|
|
map_merge:
|
|
- {get_attr: [RedisBase, role_data, config_settings]}
|
|
- redis::daemonize: false
|
|
tripleo::stunnel::manage_service: false
|
|
tripleo::stunnel::foreground: 'yes'
|
|
- tripleo::redis::firewall_rules:
|
|
'108 redis':
|
|
dport:
|
|
- 6379
|
|
- 26379
|
|
tripleo::profile::base::database::redis::tls_proxy_bind_ip:
|
|
str_replace:
|
|
template:
|
|
"%{hiera('$NETWORK')}"
|
|
params:
|
|
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
tripleo::profile::base::database::redis::tls_proxy_fqdn:
|
|
str_replace:
|
|
template:
|
|
"%{hiera('fqdn_$NETWORK')}"
|
|
params:
|
|
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
tripleo::profile::base::database::redis::tls_proxy_port: 6379
|
|
- if:
|
|
- internal_tls_enabled
|
|
- tripleo::redis::service_certificate: '/etc/pki/tls/certs/redis.crt'
|
|
redis_certificate_specs:
|
|
service_certificate: '/etc/pki/tls/certs/redis.crt'
|
|
service_key: '/etc/pki/tls/private/redis.key'
|
|
hostname:
|
|
str_replace:
|
|
template: "%{hiera('fqdn_NETWORK')}"
|
|
params:
|
|
NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
dnsnames:
|
|
- str_replace:
|
|
template: "%{hiera('cloud_name_NETWORK')}"
|
|
params:
|
|
NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
- str_replace:
|
|
template:
|
|
"%{hiera('fqdn_NETWORK')}"
|
|
params:
|
|
NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
principal:
|
|
str_replace:
|
|
template: "redis/%{hiera('fqdn_NETWORK')}"
|
|
params:
|
|
NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
postsave_cmd: "/usr/bin/certmonger-redis-refresh.sh"
|
|
- {}
|
|
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: 'redis'
|
|
# NOTE: we need the exec tag to copy /etc/redis.conf.puppet to
|
|
# /etc/redis.conf
|
|
# https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
|
|
puppet_tags: 'exec'
|
|
step_config:
|
|
list_join:
|
|
- "\n"
|
|
- - include ::tripleo::profile::base::database::redis
|
|
- {get_attr: [RedisBase, role_data, step_config]}
|
|
config_image: {get_param: DockerRedisConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/redis.json:
|
|
command: /usr/bin/redis-server /etc/redis.conf
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/run/redis
|
|
owner: redis:redis
|
|
recurse: true
|
|
/var/lib/kolla/config_files/redis_tls_proxy.json:
|
|
command: stunnel /etc/stunnel/stunnel.conf
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
docker_config:
|
|
step_1:
|
|
map_merge:
|
|
- redis_init_logs:
|
|
start_order: 0
|
|
detach: false
|
|
image: &redis_image {get_param: DockerRedisImage}
|
|
net: none
|
|
privileged: false
|
|
user: root
|
|
volumes:
|
|
- /var/log/containers/redis:/var/log/redis:z
|
|
command: ['/bin/bash', '-c', 'chown -R redis:redis /var/log/redis']
|
|
- redis:
|
|
start_order: 1
|
|
stop_grace_period: 60
|
|
image: *redis_image
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
systemd_exec_flags:
|
|
RuntimeDirectory: redis
|
|
ExecStartPre: /bin/chcon -t svirt_sandbox_file_t /var/run/redis
|
|
healthcheck:
|
|
test: /openstack/healthcheck
|
|
volumes:
|
|
- /run:/run
|
|
- /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /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
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
- if:
|
|
- internal_tls_enabled
|
|
- redis_tls_proxy:
|
|
start_order: 2
|
|
image: *redis_image
|
|
net: host
|
|
user: root
|
|
restart: always
|
|
healthcheck:
|
|
test: /openstack/healthcheck
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/redis_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro
|
|
- /etc/pki/tls/certs/redis.crt:/etc/pki/tls/certs/redis.crt:ro
|
|
- /etc/pki/tls/private/redis.key:/etc/pki/tls/private/redis.key:ro
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
- {}
|
|
metadata_settings:
|
|
if:
|
|
- internal_tls_enabled
|
|
-
|
|
- service: redis
|
|
network: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
type: vip
|
|
- service: redis
|
|
network: {get_param: [ServiceNetMap, RedisNetwork]}
|
|
type: node
|
|
- null
|
|
host_prep_tasks:
|
|
- name: create persistent directories
|
|
file:
|
|
path: "{{ item.path }}"
|
|
state: directory
|
|
with_items:
|
|
- { 'path': /var/log/containers/redis, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/run/redis, 'setype': svirt_sandbox_file_t }
|
|
- { 'path': /var/log/redis, 'setype': svirt_sandbox_file_t }
|
|
- name: ensure /var/run/redis is present upon reboot
|
|
copy:
|
|
dest: /etc/tmpfiles.d/var-run-redis.conf
|
|
content: |
|
|
d /var/run/redis 0755 root root - -
|
|
- name: redis logs readme
|
|
copy:
|
|
dest: /var/log/redis/readme.txt
|
|
content: |
|
|
Log files from redis containers can be found under
|
|
/var/log/containers/redis.
|
|
ignore_errors: true
|
|
update_tasks:
|
|
- name: Ensure redis is uninstalled on container host
|
|
when: step|int == 1
|
|
package:
|
|
name: redis
|
|
state: absent
|
|
upgrade_tasks:
|
|
- name: Ensure redis is uninstalled on container host
|
|
when: step|int == 1
|
|
package:
|
|
name: redis
|
|
state: absent
|
|
post_upgrade_tasks:
|
|
- when: step|int == 1
|
|
import_role:
|
|
name: tripleo-docker-rm
|
|
vars:
|
|
containers_to_rm:
|
|
with_items:
|
|
list_concat:
|
|
- - redis
|
|
- - if:
|
|
- internal_tls_enabled
|
|
- - redis_tls_proxy
|
|
- null
|