aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/nova/tasks/config.yml12
-rw-r--r--ansible/roles/nova/templates/nova-libvirt.json.j22
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"