openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add Docker service to the undercloud roles"

Browse Source
This commit is contained in:
Zuul
2017-11-16 15:25:09 +00:00
committed by Gerrit Code Review
parent effa7ec0cd f0b4b0dffe
commit f0be3d1f0d
4 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
environments/undercloud.yaml
View File

@@ -5,6 +5,7 @@ resource_registry:
OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
parameter_defaults: parameter_defaults:
EnablePackageInstall: true
StackAction: CREATE StackAction: CREATE
SoftwareConfigTransport: POLL_SERVER_HEAT SoftwareConfigTransport: POLL_SERVER_HEAT
NeutronTunnelTypes: [] NeutronTunnelTypes: []

1
roles/Undercloud.yaml
View File

@@ -12,6 +12,7 @@
- controller - controller
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Apache - OS::TripleO::Services::Apache
- OS::TripleO::Services::Docker
- OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::HeatApi - OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCfn - OS::TripleO::Services::HeatApiCfn

1
roles/UndercloudLight.yaml
View File

@@ -14,6 +14,7 @@
- controller - controller
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::Docker
- OS::TripleO::Services::HeatApi - OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCfn - OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine - OS::TripleO::Services::HeatEngine

1
roles_data_undercloud.yaml
View File

@@ -15,6 +15,7 @@
- controller - controller
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Apache - OS::TripleO::Services::Apache
- OS::TripleO::Services::Docker
- OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::HeatApi - OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCfn - OS::TripleO::Services::HeatApiCfn