summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-30 23:46:50 +0000
committerGerrit Code Review <review@openstack.org>2017-08-30 23:46:50 +0000
commit5f91a4bbe146d65e95a7d072d168aab399c69135 (patch)
tree617cf78fc47881bd98e4879034c456099a74df51
parentf6f232fc6887f6e19a3c7ef30969eacaf00104c9 (diff)
parent39950e6cd8a4a9b69a0f6b78110fb7cb25765111 (diff)
Merge "Add missing Docker service" into stable/pike
-rw-r--r--roles/Database.yaml1
-rw-r--r--roles/IronicConductor.yaml1
-rw-r--r--roles/Messaging.yaml1
-rw-r--r--roles/Networker.yaml1
-rw-r--r--roles/Telemetry.yaml1
5 files changed, 5 insertions, 0 deletions
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