aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-17 09:46:33 +0000
committerGerrit Code Review <review@openstack.org>2017-06-17 09:46:33 +0000
commitcb0ae4a630f69bc8d2899f02f1e5ee98daa48ffc (patch)
treecbcf5a756e6493147fc5ac89fc9a05147a4cd68f /environments/docker.yaml
parentad3d0da798addf6905957029bdbdfe2d509cc008 (diff)
parent316cc2572d0a255d466fb7f9aa74de3b8ccb6831 (diff)
Merge "Remove duplicate docker/puppet services.yaml"
Diffstat (limited to 'environments/docker.yaml')
-rw-r--r--environments/docker.yaml3
1 files changed, 0 insertions, 3 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 4e938e6..104f8fc 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -2,7 +2,6 @@ resource_registry:
# This can be used when you don't want to run puppet on the host,
# 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
@@ -60,8 +59,6 @@ resource_registry:
OS::TripleO::PostDeploySteps: ../docker/post.yaml
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
- OS::TripleO::Services: ../docker/services/services.yaml
-
parameter_defaults:
# To specify a local docker registry, enable these
# where 192.168.24.1 is the host running docker-distribution