diff options
| author |   QiLiang <liangqi1@huawei.com> | 2016-08-22 19:51:43 +0800 |
|---|---|---|
| committer | qi liang <liangqi1@huawei.com> | 2016-09-06 06:30:41 +0000 |
| commit | 14b5c214e5dfccc385afa81629111dffbabc2a48 (patch) | |
| tree | 9f5c601a658bd4a08d101c30fa6d0112f45fceaf /deploy/adapters/ansible/openstack_mitaka/roles | |
| parent | 0960913b0d973299b2d93d32d0f558ce607c5f5a (diff) | |
Imporve nova-compute virt_type confiugration
JIRA: COMPASS-461
Change-Id: I8efa45df2407fecabf2ea206f747fc61dbc1d1c8
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit ab9bbb584130ac5fea45707f9deeef20c5d35d25)
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka/roles')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml | 4 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova-compute.conf | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml index 5d7f8b60..f49896bf 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml @@ -37,6 +37,10 @@ notify: - restart nova-compute services +- name: get number of cpu support virtualization + shell: egrep -c '(vmx|svm)' /proc/cpuinfo + register: kvm_cpu_num + - name: update nova-compute conf template: src={{ item }} dest=/etc/nova/{{ item }} with_items: diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova-compute.conf b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova-compute.conf new file mode 100644 index 00000000..305d408b --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova-compute.conf @@ -0,0 +1,11 @@ +[DEFAULT] +compute_driver=libvirt.LibvirtDriver +force_raw_images = true +[libvirt] +{% if kvm_cpu_num.stdout_lines[0]|int == 0 %} +virt_type=qemu +{% else %} +virt_type=kvm +{% endif %} +images_type = raw +mem_stats_period_seconds=0 |