From a4e1ea67f6900ad69c696812f002d12a8eca45df Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 17 Mar 2017 14:29:08 +0100 Subject: [PATCH] Ignore libvirt start if running chrooted The use case is when running oooq from a privileged container. For examle, running in Centos container on the Ubuntu virthost. Services can't be restarted in such a container unless you run it as a VM (with init as pid 1). So oooq can't pass the libvirt startup task and proceed with undercloud deployment. This is controlled by a new var 'chrooted'. Defaults to False. Partial-bug: #1676373 Change-Id: If221a6a8bda496862da6249c46c2bedd955b6eac Signed-off-by: Bogdan Dobrelya --- roles/parts/libvirt/defaults/main.yml | 2 ++ roles/parts/libvirt/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/parts/libvirt/defaults/main.yml b/roles/parts/libvirt/defaults/main.yml index aad133c7f..ee8eb8492 100644 --- a/roles/parts/libvirt/defaults/main.yml +++ b/roles/parts/libvirt/defaults/main.yml @@ -10,3 +10,5 @@ libvirt_packages: # The name of the libvirt service. libvirtd_service: libvirtd +# If running in chroot-like environments (containers) +chrooted: false diff --git a/roles/parts/libvirt/tasks/main.yml b/roles/parts/libvirt/tasks/main.yml index 190a7edce..80aeb949d 100644 --- a/roles/parts/libvirt/tasks/main.yml +++ b/roles/parts/libvirt/tasks/main.yml @@ -27,4 +27,4 @@ state: running enabled: true become: true - + when: not chrooted|bool