diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-29 20:12:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-29 20:12:59 +0000 |
| commit | e8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch) | |
| tree | 2290212e2b6f529824dc499badfba578a892421b /docker/services/octavia-health-manager.yaml | |
| parent | 3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff) | |
| parent | a474ae82d5f157a48c997fb9df420442bd79dcbe (diff) | |
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/octavia-health-manager.yaml')
| -rw-r--r-- | docker/services/octavia-health-manager.yaml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index 534a35fe..2228e369 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,10 +68,10 @@ 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 @@ -75,7 +79,10 @@ outputs: 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/ @@ -83,7 +90,7 @@ outputs: step_4: octavia_health_manager: start_order: 2 - image: *octavia_image + image: *octavia_health_manager_image net: host privileged: false restart: always |