diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-04 23:29:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-04 23:29:13 +0000 |
| commit | ac03bcfffef5a83df4a458cbc92117ada6cf7301 (patch) | |
| tree | d0de725800b3a5c45d4d321270806cfd7a4ad02f /docker/services/nova-libvirt.yaml | |
| parent | 1b09a3d6e295f602c118c6656d1abce8614f915c (diff) | |
| parent | 91e7a548cb4e39e72798c8cda16f3a946128a419 (diff) | |
Merge "Remove kolla_config copy from services"
Diffstat (limited to 'docker/services/nova-libvirt.yaml')
| -rw-r--r-- | docker/services/nova-libvirt.yaml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index 480bb80e..15cee597 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -60,12 +60,7 @@ outputs: - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ] kolla_config: /var/lib/kolla/config_files/nova-libvirt.json: - command: /usr/sbin/libvirtd --config /etc/libvirt/libvirtd.conf - config_files: - - dest: /etc/libvirt/libvirtd.conf - owner: root - perm: '0644' - source: /var/lib/kolla/config_files/src/etc/libvirt/libvirtd.conf + command: /usr/sbin/libvirtd --config /etc/libvirt/libvirtd.conf docker_config: step_3: nova_libvirt: @@ -79,10 +74,10 @@ outputs: restart: always volumes: - /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/nova_libvirt:/var/lib/kolla/config_files/src:ro - - /dev:/dev + - /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro - /etc/localtime:/etc/localtime:ro - /lib/modules:/lib/modules:ro + - /dev:/dev - /run:/run - /sys/fs/cgroup:/sys/fs/cgroup - /var/lib/nova:/var/lib/nova |