diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-15 06:19:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-15 06:19:13 +0000 |
| commit | 2185b835602ffb276b8142db68d472611fdf127a (patch) | |
| tree | 50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/octavia-housekeeping.yaml | |
| parent | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff) | |
| parent | e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff) | |
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/octavia-housekeeping.yaml')
| -rw-r--r-- | docker/services/octavia-housekeeping.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml index 4414ad9c..1dc0db37 100644 --- a/docker/services/octavia-housekeeping.yaml +++ b/docker/services/octavia-housekeeping.yaml @@ -4,17 +4,11 @@ description: > OpenStack Octavia service configured with Puppet parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerOctaviaHousekeepingImage: 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: {} @@ -73,10 +67,7 @@ outputs: config_volume: octavia puppet_tags: octavia_config step_config: *step_config - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ] + config_image: {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 @@ -89,10 +80,7 @@ outputs: step_2: octavia_housekeeping_init_dirs: start_order: 0 - image: &octavia_housekeeping_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ] + image: &octavia_housekeeping_image {get_param: DockerOctaviaHousekeepingImage} user: root volumes: # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d |