diff options
| author | Steven Dake <stdake@cisco.com> | 2016-04-06 01:55:31 -0400 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-04-14 10:50:38 +0100 |
| commit | e37fa65f4fd729014f12559d36becb5853c46fce (patch) | |
| tree | cac66cca500c566e40e496a72bf8a99a6195d7f0 /ansible | |
| parent | 7a5290866d73066c3d2c53bd387fe5f3b97e56df (diff) | |
| download | kolla-e37fa65f4fd729014f12559d36becb5853c46fce.tar.gz kolla-e37fa65f4fd729014f12559d36becb5853c46fce.zip | |
Use proper CentOS repositories for ceph and qemu
CentOS has a virtualization sig and storage sig which produces
udpated ceph and qemu images. These images are then reused within
the rest of Red Hat packaging. Install these repositories for
CentOS and make use of them.
This should work for OracleLinux as well.
Still testing centos.
Co-Authored-By: Vikram Hosakote <vhosakot@cisco.com>
Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>
Change-Id: Iea21fc4f33bbfdb973cf354d492c372bd3360acb
Closes-Bug: #1566588
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/nova/tasks/config.yml | 9 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova-libvirt.json.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/qemu.conf.j2 | 0 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index 8e2e7a875..ab9981e83 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -66,10 +66,13 @@ - "nova-scheduler" - "nova-spicehtml5proxy" -- name: Copying over libvirtd.conf +- name: Copying over libvirt configuration template: - src: "libvirtd.conf.j2" - dest: "{{ node_config_directory }}/nova-libvirt/libvirtd.conf" + src: "{{ item.src }}" + dest: "{{ node_config_directory }}/nova-libvirt/{{ item.dest }}" + with_items: + - { src: "qemu.conf.j2", dest: "qemu.conf" } + - { src: "libvirtd.conf.j2", dest: "libvirtd.conf" } - name: Copying files for nova-ssh template: diff --git a/ansible/roles/nova/templates/nova-libvirt.json.j2 b/ansible/roles/nova/templates/nova-libvirt.json.j2 index abc315900..dca7056b2 100644 --- a/ansible/roles/nova/templates/nova-libvirt.json.j2 +++ b/ansible/roles/nova/templates/nova-libvirt.json.j2 @@ -6,6 +6,12 @@ "dest": "/etc/libvirt/libvirtd.conf", "owner": "root", "perm": "0644" + }, + { + "source": "{{ container_config_directory }}/qemu.conf", + "dest": "/etc/libvirt/qemu.conf", + "owner": "root", + "perm": "0644" }{% if enable_ceph | bool %}, { "source": "{{ container_config_directory }}/secrets", diff --git a/ansible/roles/nova/templates/qemu.conf.j2 b/ansible/roles/nova/templates/qemu.conf.j2 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ansible/roles/nova/templates/qemu.conf.j2 |