Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 161b2b4)
Add Docker service to all roles
authorJiri Stransky <jistr@redhat.com>
Thu, 6 Apr 2017 13:32:23 +0000 (15:32 +0200)
committerJiri Stransky <jistr@redhat.com>
Fri, 7 Apr 2017 12:28:59 +0000 (14:28 +0200)
This will add the Docker service to all roles. Note that currently by
default the Docker service is mapped to OS::Heat::None by default. It
will only be deployed if environments/docker.yaml file is included in
the deployment.

Change-Id: I9d8348b7b6576b94c872781bc89fecb42075cde0
Related-Bug: #1680395

environments/hyperconverged-ceph.yaml patch | blob | history
releasenotes/notes/docker-service-all-roles-5c22a018caeafcf0.yaml [new file with mode: 0644] patch | blob
roles_data.yaml patch | blob | history

diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml
index 8f74ec3..fee874d 100644 (file)
--- a/environments/hyperconverged-ceph.yaml
+++ b/environments/hyperconverged-ceph.yaml
@@ -32,3 +32,4 @@ parameter_defaults:
     - OS::TripleO::Services::CephOSD
     - OS::TripleO::Services::Vpp
     - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::Docker
diff --git a/releasenotes/notes/docker-service-all-roles-5c22a018caeafcf0.yaml b/releasenotes/notes/docker-service-all-roles-5c22a018caeafcf0.yaml
new file mode 100644 (file)
index 0000000..734db08
--- /dev/null
+++ b/releasenotes/notes/docker-service-all-roles-5c22a018caeafcf0.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    When deploying with environments/docker.yaml, the docker service
+    is now deployed on all predefined roles.
diff --git a/roles_data.yaml b/roles_data.yaml
index 780c9c9..5f365f4 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -162,6 +162,7 @@
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::Vpp
     - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::Docker
 
 - name: BlockStorage
   ServicesDefault:
@@ -180,6 +181,7 @@
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::Docker
 
 - name: ObjectStorage
   disable_upgrade_deployment: True
@@ -200,6 +202,7 @@
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::Docker
 
 - name: CephStorage
   ServicesDefault:
@@ -218,3 +221,4 @@
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::Docker