openstack/kolla
Code Issues Proposed changes

Merge "Create nova-libvirt directory before copying files"

Browse Source
This commit is contained in:
Jenkins 2015-09-28 09:35:25 +00:00 committed by Gerrit Code Review
commit 769493e802
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/nova/tasks/config.yml
View File

@ -129,12 +129,6 @@
dest: "{{ node_config_directory }}/nova-compute/config.json" dest: "{{ node_config_directory }}/nova-compute/config.json"
when: inventory_hostname in groups['compute'] 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 - include: ../../config.yml
vars: vars:
service_name: "nova-novncproxy" service_name: "nova-novncproxy"
@ -167,6 +161,12 @@
state: "directory" state: "directory"
when: inventory_hostname in groups['compute'] 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 - name: Copying Nova Libvirt JSON configuration file
template: template:
src: "roles/nova/templates/nova-libvirt.json.j2" src: "roles/nova/templates/nova-libvirt.json.j2"

2
ansible/roles/nova/templates/nova-libvirt.json.j2
View File

@ -2,7 +2,7 @@
"command": "/usr/sbin/libvirtd --listen", "command": "/usr/sbin/libvirtd --listen",
"config_files": [ "config_files": [
{ {
"source": "/opt/kolla/config_files/libvirt.conf", "source": "/opt/kolla/config_files/libvirtd.conf",
"dest": "/etc/libvirt/libvirtd.conf", "dest": "/etc/libvirt/libvirtd.conf",
"owner": "root", "owner": "root",
"perm": "0600" "perm": "0600"