diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-09 11:28:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-09 11:28:50 +0000 |
| commit | 2895d8d65adbc17f035425305f28a5ee0938f40d (patch) | |
| tree | d093ac63315a9a61a984875fdc627813e2e248a7 /docker/services/nova-compute.yaml | |
| parent | e7dda1bfa332bdfb38afdc0be11b67012eacb4fc (diff) | |
| parent | af3828437e4ec92a738023afd29f12225161866e (diff) | |
Merge "Make container names consistent"
Diffstat (limited to 'docker/services/nova-compute.yaml')
| -rw-r--r-- | docker/services/nova-compute.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 536cc9f1..9f647eba 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -74,7 +74,7 @@ outputs: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ] kolla_config: - /var/lib/kolla/config_files/nova-compute.json: + /var/lib/kolla/config_files/nova_compute.json: command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf permissions: - path: /var/log/nova @@ -86,7 +86,7 @@ outputs: docker_config: # FIXME: run discover hosts here step_4: - novacompute: + nova_compute: image: *nova_compute_image net: host privileged: true @@ -96,7 +96,7 @@ outputs: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - /var/lib/kolla/config_files/nova-compute.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro - /dev:/dev - /etc/iscsi:/etc/iscsi |