path: root/docker/services/nova-compute.yaml
diff options
authorMartin André <m.andre@redhat.com>2017-03-29 14:11:21 +0200
committerMartin André <m.andre@redhat.com>2017-04-03 18:24:49 +0200
commit91e7a548cb4e39e72798c8cda16f3a946128a419 (patch)
treea782dd2aa9d1c38e91ca86b5d1c4e1149f55a53e /docker/services/nova-compute.yaml
parent0ae9d9b346f1c5d7e29b8f281474577eca260670 (diff)
Remove kolla_config copy from services
Simplify the config of the containerized services by bind mounting in the configurations instead of specifying them all in kolla config. This is change is useful to limit the side effects of generating the config files and running the container is two separate steps as config directories are now bind-mounted inside the container instead of having files being copied to the container. We've seen examples of Apache's mod_ssl configuration file present on the container preventing it to start when puppet configured apache not to load the ssl module (in case TLS is disabled). Co-Authored-By: Ian Main <imain@redhat.com> Change-Id: I4ec5dd8b360faea71a044894a61790997f54d48a
Diffstat (limited to 'docker/services/nova-compute.yaml')
1 files changed, 2 insertions, 11 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 957eed7..eefcb36 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -55,16 +55,7 @@ outputs:
- [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
- 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
+ command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
# FIXME: run discover hosts here
@@ -76,7 +67,7 @@ outputs:
restart: always
- /var/lib/kolla/config_files/nova-compute.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/nova_libvirt:/var/lib/kolla/config_files/src:ro
+ - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
- /dev:/dev
- /etc/iscsi:/etc/iscsi
- /etc/localtime:/etc/localtime:ro