diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-09 11:51:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-09 11:51:28 +0000 |
| commit | 89fbbf12ca953b1c246b8b9ec2022d88245fdf36 (patch) | |
| tree | 869aa58cb1db4d0486741ab172e929d1138adf51 /environments | |
| parent | 09af40f5dbbdd335005640b538ed043dda75e77b (diff) | |
| parent | 46b5911a150aa0ce89629c3058e3ad65b2d98684 (diff) | |
Merge "Enable Docker service for Compute role"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index 3696f908..8a977f26 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -3,6 +3,8 @@ resource_registry: # e.g atomic, but it has been replaced with OS::TripleO::Services::Docker # OS::TripleO::NodeUserData: ../docker/firstboot/setup_docker_host.yaml OS::TripleO::Services::Docker: ../puppet/services/docker.yaml + # The compute node still needs extra initialization steps + OS::TripleO::Compute::NodeUserData: ../docker/firstboot/setup_docker_host.yaml #NOTE (dprince) add roles to be docker enabled as we support them OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml @@ -55,3 +57,4 @@ parameter_defaults: - OS::TripleO::Services::NovaCompute - OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::ComputeNeutronOvsAgent + - OS::TripleO::Services::Docker |