58a8b282c2
Some containers are using the logs named volume for collecting logs written to `/var/log`. We should make this consistent for all the containers. This patch also cleans up some mounts that weren't needed for some services. For example, glance-api doesn't need `/run` to be mounted. Other changes: * Rework log volumes to hostpath mounts to omit slow COW writes. * Add kolla_config's permission and host_prep_tasks create and manage hostpath mounted log dirs permissions. * Rework data owning init containers to kolla_config permissions * When a step wants KOLLA_BOOTSTRAP or DB sync, use logs data owning init containers to set permissions for logs. This is required because kolla bootsrap and DB sync runs before the kolla config stage and there is yet permissions set for logs. * In order to address hybrid cases for host services vs containerized ones to access logs having different UIDs, persist containerized services' logs into separate directories (an upgrade impact) * Ensure host prep tasks to create /var/log/containers/ and /var/lib/ sub-directories for services * Fix missing /etc/httpd, /var/www config-data mounts for zaqar/ironic * Fix YAML indentation and drop strings quotation. Co-authored-by: Bogdan Dobrelya <bdobreli@redhat.com> Partial blueprint containerized-services-logs Change-Id: I53e737120bf0121bd28667f355b6f29f1b2a6b82
122 lines
4.7 KiB
YAML
122 lines
4.7 KiB
YAML
heat_template_version: pike
|
|
|
|
description: >
|
|
OpenStack containerized Ironic PXE service
|
|
|
|
parameters:
|
|
DockerNamespace:
|
|
description: namespace
|
|
default: 'tripleoupstream'
|
|
type: string
|
|
DockerIronicPxeImage:
|
|
description: image
|
|
default: 'centos-binary-ironic-pxe:latest'
|
|
type: string
|
|
DockerIronicConfigImage:
|
|
description: image
|
|
default: 'centos-binary-ironic-pxe:latest'
|
|
type: string
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
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
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ./containers-common.yaml
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Ironic PXE role.
|
|
value:
|
|
service_name: ironic_pxe
|
|
config_settings: {}
|
|
step_config: &step_config ''
|
|
service_config_settings: {}
|
|
# BEGIN DOCKER SETTINGS
|
|
puppet_config:
|
|
config_volume: ironic
|
|
puppet_tags: ironic_config
|
|
step_config: *step_config
|
|
config_image:
|
|
list_join:
|
|
- '/'
|
|
- [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/ironic_pxe_http.json:
|
|
command: /usr/sbin/httpd -DFOREGROUND
|
|
/var/lib/kolla/config_files/ironic_pxe_tftp.json:
|
|
command: /usr/sbin/in.tftpd --foreground --user root --address 0.0.0.0:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot
|
|
permissions:
|
|
- path: /var/log/ironic
|
|
owner: ironic:ironic
|
|
recurse: true
|
|
docker_config:
|
|
step_4:
|
|
ironic_pxe_tftp:
|
|
start_order: 90
|
|
image: &ironic_pxe_image
|
|
list_join:
|
|
- '/'
|
|
- [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
|
|
# TODO(mandre) check how docker like mounting in a bind-mounted tree
|
|
# This directory may contain migrated data from BM
|
|
- /var/lib/ironic:/var/lib/ironic/
|
|
# These files were generated by puppet inside the config container
|
|
# TODO(mandre) check the mount permission (ro/rw)
|
|
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/chain.c32:/var/lib/ironic/tftpboot/chain.c32
|
|
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/pxelinux.0:/var/lib/ironic/tftpboot/pxelinux.0
|
|
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/ipxe.efi:/var/lib/ironic/tftpboot/ipxe.efi
|
|
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/undionly.kpxe:/var/lib/ironic/tftpboot/undionly.kpxe
|
|
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/map-file:/var/lib/ironic/tftpboot/map-file
|
|
- /dev/log:/dev/log
|
|
- /var/log/containers/ironic:/var/log/ironic
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
ironic_pxe_http:
|
|
start_order: 91
|
|
image: *ironic_pxe_image
|
|
net: host
|
|
privileged: false
|
|
restart: always
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
|
|
- /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro
|
|
- /var/lib/config-data/ironic/var/www/:/var/www/:ro
|
|
- /var/lib/ironic:/var/lib/ironic/
|
|
- /var/log/containers/ironic:/var/log/ironic
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
host_prep_tasks:
|
|
- name: create persistent directories
|
|
file:
|
|
path: "{{ item }}"
|
|
state: directory
|
|
with_items:
|
|
- /var/lib/ironic
|
|
- /var/log/containers/ironic
|