summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-09-08 02:22:56 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-08 02:22:56 +0000
commitf294300a38ea35d2ce5e51ad0110137d6e22086d (patch)
treeb89010a1a8f571b575bdf04bb2d528ad93f6aee1 /deploy/adapters/ansible/openstack_mitaka
parent6911e5491ec95eb7878595e186e6f2ff0bd4d237 (diff)
parent14b5c214e5dfccc385afa81629111dffbabc2a48 (diff)
Merge "Imporve nova-compute virt_type confiugration" into stable/colorado
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml4
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova-compute.conf11
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