From 8af37f28bcd5bf990ef501601ec6998b8f9b8fcc Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Tue, 28 Nov 2017 16:26:22 -0500 Subject: 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 --- lib/ansible/playbooks/deploy_dependencies.yml | 28 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'lib') 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 -- cgit 1.2.3-korg