diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-09 13:35:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-09 13:35:55 +0000 |
| commit | dc63ada9c576c2d21f5cfc71ea85d8a872ea7397 (patch) | |
| tree | 5a43e1635e7014b1d00bd62538ac938d8c992c6f | |
| parent | 21f559ec0f0cc5c3718e5fc537581dee45672d72 (diff) | |
| parent | 64500bf2d14f21ca95abd4f5990a5d4ec0389046 (diff) | |
Merge "Move nova-scheduler data into puppet_config"
| -rw-r--r-- | docker/services/nova-scheduler.yaml | 14 |
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 |