bd4b57c269
redis(non-pcmk), nova-scheduler and swift-proxy do not need /run bind mounted from the host. As a matter of fact bind-mounting /run is problematic due to a number of reasons (see LP#1883849 for more background). In particular swift-proxy is the only swift container (out of 9) that has /run bind-mounted. These three services always had /run from the very beginning: - redis -> Ie750caa34c6fa22ca6eae6834b9ca20e15d97f7f - nova-scheduler -> I39436783409ed752b08619b07b0a0c592bce0456 - swift-proxy -> I2d96514fb7aa51dffe8fe293bc950e0e99df5e94 Tested this by applying this patch on a train deployment and deployed an undercloud and an overcloud with it. Verified that: A) /run:/run is not present in the three containers B) Deploy of UC and OC worked correctly C) Tempest still works D) Restarting the swift_proxy and nova_scheduler works correctly E) Reboot the overcloud worked okay and tempest still works after the full overcloud reboot F) Ran a minor UC update G) Ran a minor update on all nodes and tempest still worked H) Ran a redeploy on all nodes and tempest still worked NB: I did not investigate other containers that bind mount /run because they 1) seem to need it and 2) had no means to do proper testing. NB2: Note that while once we rebuild containers with I81e5b7abf4571fece13a029e25911e9e4dece673 this change here is not strictly needed for the LP bug, but is a nice cleanup nonetheless. So this is to be backported only if rebuilding containers is a problematic/costly move Change-Id: Ic1a892a7f78a54b5e149f5ce52cb9db68ebc9529 Related-Bug: #1883849
263 lines
9.4 KiB
YAML
263 lines
9.4 KiB
YAML
heat_template_version: rocky
|
|
|
|
description: >
|
|
OpenStack containerized Redis services
|
|
|
|
parameters:
|
|
ContainerRedisImage:
|
|
description: image
|
|
type: string
|
|
ContainerRedisConfigImage:
|
|
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
|
|
firewall_rules:
|
|
'108 redis':
|
|
dport:
|
|
- 6379
|
|
- 26379
|
|
config_settings:
|
|
map_merge:
|
|
- {get_attr: [RedisBase, role_data, config_settings]}
|
|
- redis::daemonize: false
|
|
tripleo::stunnel::manage_service: false
|
|
tripleo::stunnel::foreground: 'yes'
|
|
- 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: ContainerRedisConfigImage}
|
|
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: /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: ContainerRedisImage}
|
|
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 container_file_t /run/redis
|
|
healthcheck:
|
|
test: /openstack/healthcheck
|
|
volumes:
|
|
- /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
|
|
- /run/redis:/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
|
|
setype: "{{ item.setype }}"
|
|
mode: "{{ item.mode|default(omit) }}"
|
|
with_items:
|
|
- { 'path': /var/log/containers/redis, 'setype': container_file_t, 'mode': '0750' }
|
|
- { '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 /run/redis 0755 root root - -
|
|
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
|
|
external_upgrade_tasks:
|
|
- when:
|
|
- step|int == 1
|
|
tags:
|
|
- never
|
|
- system_upgrade_transfer_data
|
|
- system_upgrade_stop_services
|
|
block:
|
|
- name: Stop redis container
|
|
import_role:
|
|
name: tripleo_container_stop
|
|
vars:
|
|
tripleo_containers_to_stop:
|
|
with_items:
|
|
list_concat:
|
|
- - redis
|
|
- - if:
|
|
- internal_tls_enabled
|
|
- - redis_tls_proxy
|
|
- null
|
|
tripleo_delegate_to: "{{ groups['redis'] | default([]) }}"
|