aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/manila-scheduler.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services/manila-scheduler.yaml')
-rw-r--r--docker/services/manila-scheduler.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml
index a319a033..1fc80fe8 100644
--- a/docker/services/manila-scheduler.yaml
+++ b/docker/services/manila-scheduler.yaml
@@ -4,17 +4,11 @@ description: >
OpenStack containerized Manila Scheduler service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerManilaSchedulerImage:
description: image
- default: 'centos-binary-manila-scheduler:latest'
type: string
DockerManilaConfigImage:
description: The container image to use for the manila config_volume
- default: 'centos-binary-manila-api:latest'
type: string
EndpointMap:
default: {}
@@ -65,10 +59,7 @@ outputs:
config_volume: manila
puppet_tags: manila_config,manila_scheduler_paste_ini
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ]
+ config_image: {get_param: DockerManilaConfigImage}
kolla_config:
/var/lib/kolla/config_files/manila_scheduler.json:
command: /usr/bin/manila-scheduler --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -84,10 +75,7 @@ outputs:
docker_config:
step_4:
manila_scheduler:
- image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerManilaSchedulerImage} ]
+ image: {get_param: DockerManilaSchedulerImage}
net: host
restart: always
volumes: