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: [PATCH] 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/firstboot/setup_docker_host.sh         | 11 -----------
 docker/firstboot/setup_docker_host.yaml       | 19 -------------------
 docker/services/nova-libvirt.yaml             | 13 +++++++++++++
 .../docker-services-tls-everywhere.yaml       |  5 -----
 environments/docker.yaml                      |  6 ------
 5 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100755 docker/firstboot/setup_docker_host.sh
 delete mode 100644 docker/firstboot/setup_docker_host.yaml

diff --git a/docker/firstboot/setup_docker_host.sh b/docker/firstboot/setup_docker_host.sh
deleted file mode 100755
index af213bbdac..0000000000
--- a/docker/firstboot/setup_docker_host.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -eux
-# This file contains setup steps that can't be or have not yet been moved to
-# puppet
-
-# Disable libvirtd since it conflicts with nova_libvirt container
-/usr/bin/systemctl disable libvirtd.service
-/usr/bin/systemctl stop libvirtd.service
-# Disable virtlogd since it conflicts with nova_virtlogd container
-/usr/bin/systemctl disable virtlogd.service
-/usr/bin/systemctl stop virtlogd.service
diff --git a/docker/firstboot/setup_docker_host.yaml b/docker/firstboot/setup_docker_host.yaml
deleted file mode 100644
index ddfa880266..0000000000
--- a/docker/firstboot/setup_docker_host.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-heat_template_version: pike
-
-resources:
-
-  userdata:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: {get_resource: setup_docker_host}
-
-  setup_docker_host:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config: {get_file: ./setup_docker_host.sh}
-
-outputs:
-  OS::stack_id:
-    value: {get_resource: userdata}
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 7637e6e9ff..62c25bb246 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
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml
index 49d02e6f1c..2fa0cc16f4 100644
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@@ -1,11 +1,6 @@
 # This environment contains the services that can work with TLS-everywhere.
 resource_registry:
-  # This can be used when you don't want to run puppet on the host,
-  # e.g atomic, but it has been replaced with OS::TripleO::Services::Docker
-  # OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
   OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
-  # The compute node still needs extra initialization steps
-  OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
 
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 9b977f6eff..ebaf269496 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -1,10 +1,4 @@
 resource_registry:
-  # This can be used when you don't want to run puppet on the host,
-  # e.g atomic, but it has been replaced with OS::TripleO::Services::Docker
-  # OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
-  # The compute node still needs extra initialization steps
-  OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml
-
   OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
   # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
   OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml