From f7a84702de0984f77a24da0737408ada019e602a Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Tue, 30 May 2017 17:29:51 +0200
Subject: Refactor setup_docker_host.sh as host_prep_tasks

Previously what we've been doing with setup_docker_host.sh can now be
achieved with host_prep_tasks, and we can free up the NodeUserData
interface for other use cases.

Closes-Bug: #1711387
Change-Id: Iaac90efd03e37ceb02c312f9c15c1da7d4982510
---
 docker/services/nova-libvirt.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'docker/services/nova-libvirt.yaml')

diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 7637e6e9..62c25bb2 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -243,6 +243,19 @@ outputs:
           file:
             path: /etc/ceph
             state: directory
+        - name: check if libvirt is installed
+          command: /usr/bin/rpm -q libvirt-daemon
+          failed_when: false
+          register: libvirt_installed
+        - name: make sure libvirt services are disabled
+          service:
+            name: "{{ item }}"
+            state: stopped
+            enabled: no
+          with_items:
+            - libvirtd.service
+            - virtlogd.socket
+          when: libvirt_installed.rc == 0
       upgrade_tasks:
         - name: Stop and disable libvirtd service
           tags: step2
-- 
cgit 1.2.3-korg