aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/cinder-scheduler.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-15 06:19:13 +0000
committerGerrit Code Review <review@openstack.org>2017-07-15 06:19:13 +0000
commit2185b835602ffb276b8142db68d472611fdf127a (patch)
tree50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/cinder-scheduler.yaml
parent07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff)
parente76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff)
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/cinder-scheduler.yaml')
-rw-r--r--docker/services/cinder-scheduler.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index d9962ef..1bae005 100644
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@@ -4,17 +4,11 @@ description: >
OpenStack containerized Cinder Scheduler service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerCinderSchedulerImage:
description: image
- default: 'centos-binary-cinder-scheduler:latest'
type: string
DockerCinderConfigImage:
description: The container image to use for the cinder config_volume
- default: 'centos-binary-cinder-api:latest'
type: string
EndpointMap:
default: {}
@@ -73,10 +67,7 @@ outputs:
config_volume: cinder
puppet_tags: cinder_config,file,concat,file_line
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+ config_image: {get_param: DockerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_scheduler.json:
command: /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -92,10 +83,7 @@ outputs:
docker_config:
step_2:
cinder_scheduler_init_logs:
- image: &cinder_scheduler_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerCinderSchedulerImage} ]
+ image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage}
privileged: false
user: root
volumes: