diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-27 13:10:00 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-27 13:44:50 +0000 |
| commit | 5e60d8ec873870fc7995b8ea006652a3381f523f (patch) | |
| tree | c5002cc2c556e3d5fcf37dec42a345eec9f4f96b | |
| parent | f2aea128b320f77050cef5b55417914c95aeeafb (diff) | |
| download | kolla-5e60d8ec873870fc7995b8ea006652a3381f523f.tar.gz kolla-5e60d8ec873870fc7995b8ea006652a3381f523f.zip | |
Create nova-libvirt directory before copying files
The previous patch (I92f2eac895283791b2eea6a4351a43e90fdbb5a3) didn't
fix it because of the ceph patch that merged.
Change-Id: I82207f5cc684f7c180e301cac69fcc98fca63268
Partially-Implements: blueprint replace-config-external
| -rw-r--r-- | ansible/roles/nova/tasks/config.yml | 12 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova-libvirt.json.j2 | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index ff0a522fa..0ba4ad34b 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -129,12 +129,6 @@ dest: "{{ node_config_directory }}/nova-compute/config.json" when: inventory_hostname in groups['compute'] -- name: Copying over config(s) - template: - src: "libvirtd.conf.j2" - dest: "{{ node_config_directory }}/nova-libvirt/libvirtd.conf" - when: inventory_hostname in groups['compute'] - - include: ../../config.yml vars: service_name: "nova-novncproxy" @@ -167,6 +161,12 @@ state: "directory" when: inventory_hostname in groups['compute'] +- name: Copying over config(s) + template: + src: "libvirtd.conf.j2" + dest: "{{ node_config_directory }}/nova-libvirt/libvirtd.conf" + when: inventory_hostname in groups['compute'] + - name: Copying Nova Libvirt JSON configuration file template: src: "roles/nova/templates/nova-libvirt.json.j2" diff --git a/ansible/roles/nova/templates/nova-libvirt.json.j2 b/ansible/roles/nova/templates/nova-libvirt.json.j2 index ee0aac1c6..598cc9f64 100644 --- a/ansible/roles/nova/templates/nova-libvirt.json.j2 +++ b/ansible/roles/nova/templates/nova-libvirt.json.j2 @@ -2,7 +2,7 @@ "command": "/usr/sbin/libvirtd --listen", "config_files": [ { - "source": "/opt/kolla/config_files/libvirt.conf", + "source": "/opt/kolla/config_files/libvirtd.conf", "dest": "/etc/libvirt/libvirtd.conf", "owner": "root", "perm": "0600" |