Merge "Remove DockerNamespace references"

[apex-tripleo-heat-templates.git] / environments / docker.yaml

diff --git a/environments/docker.yaml b/environments/docker.yaml
index c32001a..52b2dc0 100644 (file)
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -63,18 +63,3 @@ resource_registry:
 
   OS::TripleO::PostDeploySteps: ../docker/post.yaml
   OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
-
-parameter_defaults:
-  # To specify a local docker registry, enable these
-  # where 192.168.24.1 is the host running docker-distribution
-  #DockerNamespace: 192.168.24.1:8787/tripleoupstream
-  #DockerNamespaceIsRegistry: true
-
-  ComputeServices:
-    - OS::TripleO::Services::NovaCompute
-    - OS::TripleO::Services::NovaLibvirt
-    - OS::TripleO::Services::ComputeNeutronOvsAgent
-    - OS::TripleO::Services::Docker
-    - OS::TripleO::Services::CeilometerAgentCompute
-    - OS::TripleO::Services::Sshd
-    - OS::TripleO::Services::OpenDaylightOvs