Merge "Add Docker service to all roles"

This commit is contained in:
Jenkins 2017-04-07 16:51:35 +00:00 committed by Gerrit Code Review
commit aabb90e7a1
3 changed files with 10 additions and 0 deletions

View File

@ -33,3 +33,4 @@ parameter_defaults:
- OS::TripleO::Services::CephOSD
- OS::TripleO::Services::Vpp
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Docker

View File

@ -0,0 +1,5 @@
---
features:
- |
When deploying with environments/docker.yaml, the docker service
is now deployed on all predefined roles.

View File

@ -163,6 +163,7 @@
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Vpp
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Docker
- name: BlockStorage
ServicesDefault:
@ -182,6 +183,7 @@
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Docker
- name: ObjectStorage
disable_upgrade_deployment: True
@ -203,6 +205,7 @@
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Docker
- name: CephStorage
ServicesDefault:
@ -222,3 +225,4 @@
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Docker