diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-04-07 16:51:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-04-07 16:51:36 +0000 |
commit | aabb90e7a1b003203db7c96a270c4e530f1ee8aa (patch) | |
tree | 818784662dd68be08ac40aa8aeb810681957a29e | |
parent | e221203da48c329147894923272d335560848fc2 (diff) | |
parent | e9abec82733024a0ad10eb26009517f87362ce4d (diff) |
Merge "Add Docker service to all roles"
-rw-r--r-- | environments/hyperconverged-ceph.yaml | 1 | ||||
-rw-r--r-- | releasenotes/notes/docker-service-all-roles-5c22a018caeafcf0.yaml | 5 | ||||
-rw-r--r-- | roles_data.yaml | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index 7b778aad..f1c90e2d 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -33,3 +33,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 index 00000000..734db08a --- /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 d7721353..48859473 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -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 |