summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-03-07 13:17:29 -0500
committerMartin André <m.andre@redhat.com>2017-03-08 08:59:11 +0100
commit64500bf2d14f21ca95abd4f5990a5d4ec0389046 (patch)
treeac7bd6a1a4ac5d238f2f84c04417805577868e40 /docker
parent46b5911a150aa0ce89629c3058e3ad65b2d98684 (diff)
Move nova-scheduler data into puppet_config
This is now required per the puppet_config interfaces for docker services (per I208c1ef1550ab39ab0ee47ab282f9b1937379810) Change-Id: Iab96919cb0a6b15942f3c19f8d28205261174edc
Diffstat (limited to 'docker')
-rw-r--r--docker/services/nova-scheduler.yaml14
1 files changed, 7 insertions, 7 deletions
diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index c24d5b26..ad556e0c 100644
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@@ -55,13 +55,13 @@ outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNovaSchedulerImage} ]
puppet_config:
- config_volume: nova
- puppet_tags: nova_config
- step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
+ config_volume: nova
+ puppet_tags: nova_config
+ step_config: *step_config
+ config_image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
kolla_config:
/var/lib/kolla/config_files/nova_scheduler.json:
command: /usr/bin/nova-scheduler