diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-06-08 19:07:51 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2017-06-09 17:10:43 +0100 |
| commit | 316cc2572d0a255d466fb7f9aa74de3b8ccb6831 (patch) | |
| tree | cfcfed57b679024ed5be2d94a6bfa73bd2e26807 /environments | |
| parent | cf17396a371d4e48ff9a961c813a1327b4631ee8 (diff) | |
Remove duplicate docker/puppet services.yaml
Move to one common services.yaml not only reduces the duplication, but it
should improve performance for the docker/services.yaml case, because we were
creating two ResourceChains with $many services which we know can be really
slow (especially since we seem to be missing concurrent: true on one)
Change-Id: I76f188438bfc6449b152c2861d99738e6eb3c61b
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker-services-tls-everywhere.yaml | 2 | ||||
| -rw-r--r-- | environments/docker.yaml | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml index 2740664c..f1e3d96b 100644 --- a/environments/docker-services-tls-everywhere.yaml +++ b/environments/docker-services-tls-everywhere.yaml @@ -35,8 +35,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: # Defaults to 'tripleoupstream'. Specify a local docker registry # Example: 192.168.24.1:8787/tripleoupstream diff --git a/environments/docker.yaml b/environments/docker.yaml index 28527945..bb1ebdc3 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 @@ -51,8 +50,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 |