summaryrefslogtreecommitdiffstats
path: root/docker/services/nova-ironic.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-04 23:29:12 +0000
committerGerrit Code Review <review@openstack.org>2017-04-04 23:29:13 +0000
commitac03bcfffef5a83df4a458cbc92117ada6cf7301 (patch)
treed0de725800b3a5c45d4d321270806cfd7a4ad02f /docker/services/nova-ironic.yaml
parent1b09a3d6e295f602c118c6656d1abce8614f915c (diff)
parent91e7a548cb4e39e72798c8cda16f3a946128a419 (diff)
Merge "Remove kolla_config copy from services"
Diffstat (limited to 'docker/services/nova-ironic.yaml')
-rw-r--r--docker/services/nova-ironic.yaml11
1 files changed, 1 insertions, 10 deletions
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 3d849f59..9941abda 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -58,15 +58,6 @@ outputs:
kolla_config:
/var/lib/kolla/config_files/nova_ironic.json:
command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
- config_files:
- - dest: /etc/nova/nova.conf
- owner: nova
- perm: '0600'
- source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
- - dest: /etc/nova/rootwrap.conf
- owner: nova
- perm: '0600'
- source: /var/lib/kolla/config_files/src/etc/nova/rootwrap.conf
docker_config:
step_5:
novacompute:
@@ -80,7 +71,7 @@ outputs:
restart: always
volumes:
- /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/nova:/var/lib/kolla/config_files/src:ro
+ - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
- /etc/localtime:/etc/localtime:ro
- /run:/run
- /dev:/dev