diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-17 09:46:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-17 09:46:33 +0000 |
| commit | cb0ae4a630f69bc8d2899f02f1e5ee98daa48ffc (patch) | |
| tree | cbcf5a756e6493147fc5ac89fc9a05147a4cd68f /environments | |
| parent | ad3d0da798addf6905957029bdbdfe2d509cc008 (diff) | |
| parent | 316cc2572d0a255d466fb7f9aa74de3b8ccb6831 (diff) | |
Merge "Remove duplicate docker/puppet services.yaml"
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 4e938e69..104f8fcf 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 |