From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 29 Aug 2017 15:30:18 +0000 (-0600)
Subject: Add missing Docker service
X-Git-Tag: opnfv-6.0.0~178^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=39950e6cd8a4a9b69a0f6b78110fb7cb25765111;p=apex-tripleo-heat-templates.git

Add missing Docker service

The example composable roles are missing the docker service declaration
so they currently do not work when trying to deploy with containerized
services.

Change-Id: I986ae561b950e74aacea10bce84673e8d0c9bd97
Closes-Bug: #1713755
(cherry picked from commit 50c975d1590930e6ce453942f99759a25ec08703)
---

diff --git a/roles/Database.yaml b/roles/Database.yaml
index ffeada05..689b1617 100644
--- a/roles/Database.yaml
+++ b/roles/Database.yaml
@@ -12,6 +12,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CertmongerUser
     - OS::TripleO::Services::Collectd
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::MySQL
diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml
index d5d8ddd7..3d437aa3 100644
--- a/roles/IronicConductor.yaml
+++ b/roles/IronicConductor.yaml
@@ -10,6 +10,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CertmongerUser
     - OS::TripleO::Services::Collectd
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::IronicConductor
     - OS::TripleO::Services::Kernel
diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml
index cd6071c4..5c793740 100644
--- a/roles/Messaging.yaml
+++ b/roles/Messaging.yaml
@@ -12,6 +12,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CertmongerUser
     - OS::TripleO::Services::Collectd
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Ntp
diff --git a/roles/Networker.yaml b/roles/Networker.yaml
index 1bf58031..ac30c2fd 100644
--- a/roles/Networker.yaml
+++ b/roles/Networker.yaml
@@ -13,6 +13,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CertmongerUser
     - OS::TripleO::Services::Collectd
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::MySQLClient
diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml
index 1dbb887f..5cea5f45 100644
--- a/roles/Telemetry.yaml
+++ b/roles/Telemetry.yaml
@@ -19,6 +19,7 @@
     - OS::TrieplO::Services::CeilometerCollector
     - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CertmongerUser
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd