summaryrefslogtreecommitdiffstats
path: root/docker/services/octavia-health-manager.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services/octavia-health-manager.yaml')
-rw-r--r--docker/services/octavia-health-manager.yaml29
1 files changed, 23 insertions, 6 deletions
diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index 534a35fe..0e493294 100644
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@@ -12,6 +12,10 @@ parameters:
description: image
default: 'centos-binary-octavia-health-manager:latest'
type: string
+ DockerOctaviaConfigImage:
+ description: The container image to use for the octavia config_volume
+ default: 'centos-binary-octavia-api:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -64,26 +68,39 @@ outputs:
config_volume: octavia
puppet_tags: octavia_config
step_config: *step_config
- config_image: &octavia_image
+ config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHealthManagerImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/octavia_health_manager.json:
command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
docker_config:
step_2:
octavia_health_manager_init_dirs:
start_order: 0
- image: *octavia_image
+ image: &octavia_health_manager_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHealthManagerImage} ]
user: root
volumes:
- - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
+ # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d
+ # It is normally created as part of the RPM install, but it is
+ # missing here because we use the same config_volume for all
+ # octavia services, hence the same container image to generate
+ # configuration.
+ - /var/lib/config-data/puppet-generated/octavia/etc/octavia:/etc/octavia/
command: ['/bin/bash', '-c', 'mkdir -p /etc/octavia/conf.d/octavia-health-manager; chown -R octavia:octavia /etc/octavia/conf.d/octavia-health-manager']
step_4:
octavia_health_manager:
start_order: 2
- image: *octavia_image
+ image: *octavia_health_manager_image
net: host
privileged: false
restart: always
@@ -92,7 +109,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/octavia_health_manager.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/octavia/etc/octavia/:/etc/octavia/:ro
+ - /var/lib/config-data/puppet-generated/octavia/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/octavia:/var/log/octavia
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS