X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fnova-libvirt.yaml;h=004d624a787ef6638f31d1bd1add1003c303f08e;hb=854b5120cc04418b34e45a523d0ea67ae64a448e;hp=36511557190e6a82530feccf7891ab105c5ecaae;hpb=597de6ec400d6971f136a770dc01416e81273409;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 36511557..004d624a 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   OpenStack Libvirt Service
@@ -41,6 +41,14 @@ outputs:
       config_settings: {get_attr: [NovaLibvirtBase, role_data, config_settings]}
       step_config: {get_attr: [NovaLibvirtBase, role_data, step_config]}
       puppet_tags: nova_config
+      kolla_config:
+        /var/lib/etc-data/json-config/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/libvirtd.conf
       docker_config:
         step_1:
           nova_libvirt:
@@ -55,6 +63,11 @@ outputs:
             volumes:
               - /var/lib/etc-data/json-config/nova-libvirt.json:/var/lib/kolla/config_files/config.json
               - /var/lib/etc-data/libvirt/libvirtd.conf:/var/lib/kolla/config_files/libvirtd.conf
+              # NOTE(mandre) Ideally the qemu.conf file is mounted in
+              # /var/lib/kolla/config_files and copied to the right place but
+              # copy-json.py doesn't allow us to do that without appending the
+              # file as an additional config on the CLI
+              - /var/lib/etc-data/libvirt/qemu.conf:/etc/libvirt/qemu.conf:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro
               - /run:/run