aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/octavia-health-manager.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-10 17:20:09 +0000
committerGerrit Code Review <review@openstack.org>2017-07-10 17:20:09 +0000
commit322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch)
treec0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/octavia-health-manager.yaml
parent83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff)
parentcf18e865d14adc319b6c2dfafd650f32dad4d853 (diff)
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/octavia-health-manager.yaml')
-rw-r--r--docker/services/octavia-health-manager.yaml14
1 files changed, 12 insertions, 2 deletions
diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index 2228e369..0e493294 100644
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@@ -75,6 +75,11 @@ outputs:
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:
@@ -85,7 +90,12 @@ outputs:
- [ {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:
@@ -99,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