diff --git a/defaults/main.yml b/defaults/main.yml
index 10a1a3f0..96d387f9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -60,6 +60,9 @@ nova_rpc_thread_pool_size: 64
 nova_rpc_conn_pool_size: 30
 nova_rpc_response_timeout: 60
 
+## Nova virtualization Type Autodetect, set to True if nova_virt_type is not set
+nova_virt_autodetect: True
+
 ## Nova virtualization Type, set to KVM if supported
 nova_virt_type: kvm
 
diff --git a/tasks/nova_compute.yml b/tasks/nova_compute.yml
index 70da214f..5a1198a7 100644
--- a/tasks/nova_compute.yml
+++ b/tasks/nova_compute.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 - include: nova_compute_kvm.yml
-  when: nova_virt_type == 'kvm' or nova_virt_type == 'qemu'
+  when: nova_virt_type == 'kvm' or nova_virt_type == 'qemu' or nova_virt_autodetect | bool
 
 - include: nova_compute_key_populate.yml
 
diff --git a/tasks/nova_post_install.yml b/tasks/nova_post_install.yml
index 37ef3d87..b6f55d58 100644
--- a/tasks/nova_post_install.yml
+++ b/tasks/nova_post_install.yml
@@ -13,6 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Get virt type value and store as var
+  shell: |
+    /usr/bin/egrep -c '(vmx|svm)' /proc/cpuinfo
+  register: virt_type_value
+  changed_when: false
+  failed_when: false
+  when: nova_virt_type != 'kvm' and nova_virt_type != 'qemu' and nova_virt_autodetect | bool
+  tags:
+    - nova-config
+    - nova-post-install
+
+- name: Register a fact for the nova virt type
+  set_fact:
+     nova_virt_type: "{{ ((virt_type_value.stdout | int) > 0) | ternary('kvm', 'qemu') }}"
+  when: nova_virt_type != 'kvm' and nova_virt_type != 'qemu' and nova_virt_autodetect | bool
+  tags:
+    - nova-config
+    - nova-post-install
+
 - name: Copy nova config
   config_template:
     src: "{{ item.src }}"