summaryrefslogtreecommitdiffstats
path: root/docker/services/octavia-housekeeping.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services/octavia-housekeeping.yaml')
-rw-r--r--docker/services/octavia-housekeeping.yaml15
1 files changed, 11 insertions, 4 deletions
diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index ed20310d..c2986c63 100644
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@@ -12,6 +12,10 @@ parameters:
description: image
default: 'centos-binary-octavia-housekeeping: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: DockerOctaviaHousekeepingImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/octavia_housekeeping.json:
command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
@@ -75,7 +79,10 @@ outputs:
step_2:
octavia_housekeeping_init_dirs:
start_order: 0
- image: *octavia_image
+ image: &octavia_housekeeping_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ]
user: root
volumes:
- /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
@@ -83,7 +90,7 @@ outputs:
step_4:
octavia_housekeeping:
start_order: 2
- image: *octavia_image
+ image: *octavia_housekeeping_image
net: host
privileged: false
restart: always