Merge "Correct nova virt type detection" into stable/ocata
This commit is contained in:
commit
2dea199dc4
|
@ -55,8 +55,6 @@
|
|||
|
||||
- include: nova_virt_detect.yml
|
||||
static: no
|
||||
when:
|
||||
- nova_virt_type is not defined
|
||||
tags:
|
||||
- always
|
||||
- nova-config
|
||||
|
|
|
@ -17,34 +17,32 @@
|
|||
command: cat /proc/cpuinfo
|
||||
register: cpuinfo_contents
|
||||
changed_when: false
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Register a fact for the nova qemu virt type
|
||||
set_fact:
|
||||
nova_virt_type: "qemu"
|
||||
tags:
|
||||
- always
|
||||
when:
|
||||
- nova_virt_type is not defined
|
||||
|
||||
- name: Register a fact for the nova kvm virt type
|
||||
set_fact:
|
||||
nova_virt_type: "kvm"
|
||||
when:
|
||||
- nova_virt_type is not defined
|
||||
- cpuinfo_contents.stdout.find('vmx') != -1
|
||||
or cpuinfo_contents.stdout.find('svm') != -1
|
||||
or cpuinfo_contents.stdout.find('PowerNV') != -1
|
||||
or (cpuinfo_contents.stdout.find('pSeries') != -1
|
||||
and cpuinfo_contents.stdout.find('qemu') != -1
|
||||
and ansible_architecture == 'ppc64le')
|
||||
tags:
|
||||
- nova-virt-type-set
|
||||
|
||||
- name: Register a fact for the nova powervm virt type
|
||||
set_fact:
|
||||
nova_virt_type: "powervm"
|
||||
when:
|
||||
- nova_virt_type is not defined
|
||||
- cpuinfo_contents.stdout.find('pSeries') != -1
|
||||
- ansible_architecture == 'ppc64le'
|
||||
- cpuinfo_contents.stdout.find('qemu') == -1
|
||||
tags:
|
||||
- nova-virt-type-set
|
||||
|
||||
- name: Register a fact for the nova qemu virt type
|
||||
set_fact:
|
||||
nova_virt_type: "qemu"
|
||||
when:
|
||||
- nova_virt_type is not defined
|
||||
|
|
Loading…
Reference in New Issue