diff options
author | Feng Pan <fpan@redhat.com> | 2017-11-28 16:26:22 -0500 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2017-11-30 17:19:09 -0500 |
commit | 8af37f28bcd5bf990ef501601ec6998b8f9b8fcc (patch) | |
tree | ae4d708aea7724e0afcd6546e7e896f28b73647f /lib/ansible/playbooks/deploy_dependencies.yml | |
parent | 53b4d59e1b5ffd2095d75c88943bbf4970dca053 (diff) |
Fix nested kvm detection and enablement
- Fix ansible kvm_intel kernel module reload when trying to enable
nested kvm
- Add "--libvirt-type qemu" to deploy command when nested kvm is
not enabled.
JIRA: APEX-514
Change-Id: I0e659b1c99b5732854d723e1cb049845cb60ef37
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/ansible/playbooks/deploy_dependencies.yml')
-rw-r--r-- | lib/ansible/playbooks/deploy_dependencies.yml | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/ansible/playbooks/deploy_dependencies.yml b/lib/ansible/playbooks/deploy_dependencies.yml index d2749675..545ee33d 100644 --- a/lib/ansible/playbooks/deploy_dependencies.yml +++ b/lib/ansible/playbooks/deploy_dependencies.yml @@ -54,18 +54,24 @@ name: default autostart: yes state: active - - lineinfile: - path: /etc/modprobe.d/kvm_intel.conf - line: 'options kvm-intel nested=1' - create: yes - when: ansible_architecture == "x86_64" - - modprobe: - name: "{{ item }}" - state: present - with_items: - - kvm - - kvm_intel + - shell: cat /sys/module/kvm_intel/parameters/nested || true + register: nested_result when: ansible_architecture == "x86_64" + - name: reload kvm_intel + block: + - lineinfile: + path: /etc/modprobe.d/kvm_intel.conf + line: 'options kvm-intel nested=1' + create: yes + - modprobe: + name: kvm_intel + state: absent + - modprobe: + name: kvm_intel + state: present + when: + - ansible_architecture == "x86_64" + - "'Y' not in nested_result.stdout" - name: Generate SSH key for root if missing shell: test -e ~/.ssh/id_rsa || ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa - name: Check that /u/l/python3.4/site-packages/virtualbmc/vbmc.py exists |