aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-compute.yaml
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-07 15:35:55 +0200
committerMartin André <m.andre@redhat.com>2017-06-09 09:04:44 +0200
commitaf3828437e4ec92a738023afd29f12225161866e (patch)
tree7ca0f1380dbf48929391de197c4760c8bcdb8d6b /docker/services/nova-compute.yaml
parent753d0f9aceb697fa37729cb6af12ecb7dc8b7f23 (diff)
Make container names consistent
This commit change the container names to consistently use the `_` char as a word separator and make the kolla external config file match the container name to make operators' life easier. Change-Id: Ibac9d76dde474b94c3cb86031ead0fd0327e126f
Diffstat (limited to 'docker/services/nova-compute.yaml')
-rw-r--r--docker/services/nova-compute.yaml6
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