diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 09:35:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 09:35:25 +0000 |
| commit | 769493e802ab12c5d2b1dca0079ed397cc740413 (patch) | |
| tree | dd2108bee8eab53f0a11fbfaefaf57db50a34b2e | |
| parent | 018d806204f4b3f90e0b061937826b3b3b22d146 (diff) | |
| parent | 5e60d8ec873870fc7995b8ea006652a3381f523f (diff) | |
| download | kolla-769493e802ab12c5d2b1dca0079ed397cc740413.tar.gz kolla-769493e802ab12c5d2b1dca0079ed397cc740413.zip | |
Merge "Create nova-libvirt directory before copying files"
| -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" |