flatten database service Redis
This change combines the previous puppet and docker files into a single file that performs the docker service installation and configuration. With this patch the baremetal version of database service Redis has been removed. Change-Id: I530ee8196e1d4b81ae4886b234e1a530cf34becf Related-Blueprint: services-yaml-flattening
This commit is contained in:
David J Peacock
233
deployment/database/redis-container-puppet.yaml
Normal file
233
deployment/database/redis-container-puppet.yaml
Normal file
@@ -0,0 +1,233 @@
|
||||
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: ../../docker/services/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('cloud_name_NETWORK')}"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
|
||||
principal:
|
||||
str_replace:
|
||||
template: "redis/%{hiera('cloud_name_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:
|
||||
get_attr: [RedisBase, role_data, metadata_settings]
|
||||
if:
|
||||
- internal_tls_enabled
|
||||
-
|
||||
- service: redis
|
||||
network: {get_param: [ServiceNetMap, RabbitmqNetwork]}
|
||||
type: vip
|
||||
- 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: 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
|
||||
upgrade_tasks: []
|
||||
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
|
||||
Reference in New Issue
Block a user