627971b2a1
We were setting them in the Dockerfile's previously. However this caused the healtcheck commands to always run regardless of which process we were running in the container. This caused 'unhealthy' containers at times they were never intended to be checked. This change makes it so they are explicitly set. Change-Id: I7bc12d236b3cc7a52d3e6aa706fd04675dad3a9a
114 lines
4.0 KiB
YAML
114 lines
4.0 KiB
YAML
heat_template_version: pike
|
|
|
|
description: >
|
|
OpenStack containerized Manila Scheduler service
|
|
|
|
parameters:
|
|
DockerManilaSchedulerImage:
|
|
description: image
|
|
type: string
|
|
DockerManilaConfigImage:
|
|
description: The container image to use for the manila 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
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ./containers-common.yaml
|
|
|
|
MySQLClient:
|
|
type: ../../puppet/services/database/mysql-client.yaml
|
|
|
|
ManilaSchedulerPuppetBase:
|
|
type: ../../puppet/services/manila-scheduler.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 Manila Scheduler role.
|
|
value:
|
|
service_name: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_name]}
|
|
config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, config_settings]}
|
|
logging_source: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_source]}
|
|
logging_groups: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_groups]}
|
|
step_config: &step_config
|
|
list_join:
|
|
- "\n"
|
|
- - {get_attr: [ManilaSchedulerPuppetBase, role_data, step_config]}
|
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
service_config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_config_settings]}
|
|
# BEGIN DOCKER SETTINGS #
|
|
puppet_config:
|
|
config_volume: manila
|
|
puppet_tags: manila_config,manila_scheduler_paste_ini
|
|
step_config: *step_config
|
|
config_image: {get_param: DockerManilaConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/manila_scheduler.json:
|
|
command: /usr/bin/manila-scheduler --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/log/manila
|
|
owner: manila:manila
|
|
recurse: true
|
|
docker_config:
|
|
step_4:
|
|
manila_scheduler:
|
|
image: {get_param: DockerManilaSchedulerImage}
|
|
net: host
|
|
restart: always
|
|
healthcheck:
|
|
test: /openstack/healthcheck
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
-
|
|
- /var/lib/kolla/config_files/manila_scheduler.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
|
|
- /var/log/containers/manila:/var/log/manila
|
|
environment:
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
host_prep_tasks:
|
|
- name: Create persistent manila logs directory
|
|
file:
|
|
path: /var/log/containers/manila
|
|
state: directory
|
|
upgrade_tasks:
|
|
- name: Stop and disable manila_scheduler service
|
|
tags: step2
|
|
service: name=openstack-manila-scheduler state=stopped enabled=no
|