aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-03-07 16:06:30 +0100
committerMartin André <m.andre@redhat.com>2017-03-08 08:57:00 +0100
commit46b5911a150aa0ce89629c3058e3ad65b2d98684 (patch)
tree0c985a90e5040949aa79dab1a6c3c72d97fbf8f3 /environments/docker.yaml
parented2b3b773f257926e44d0ccdbe460259271863d6 (diff)
Enable Docker service for Compute role
A recent commit [1] change how docker is installed and configured on the overcloud nodes, from a cloud-init script to a proper puppet profile in puppet-tripleo but forgot to enable the docker service on the compute nodes. [1] Ia50169819cb959025866348b11337728f8ed5c9e Change-Id: I202723d0e48f110e5b0dbfe3dcf6646da9f37948
Diffstat (limited to 'environments/docker.yaml')
-rw-r--r--environments/docker.yaml3
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