Merge "Clean up old functions"

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

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 6376b74..c03d851 100644 (file)
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -3,20 +3,18 @@ resource_registry:
   OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml
   OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
 
-parameters:
-  NovaImage: atomic-image
-
 parameter_defaults:
+  NovaImage: atomic-image
   # Defaults to 'tripleoupstream'.  Specify a local docker registry
-  # Example: 192.168.122.131:8787
+  # Example: 192.0.2.1:8787/tripleoupstream
   DockerNamespace: tripleoupstream
   # Enable local Docker registry
   DockerNamespaceIsRegistry: false
   # Compute Node Images
   DockerComputeImage: centos-binary-nova-compute:latest
+  DockerAgentImage: heat-docker-agents:latest
   DockerComputeDataImage: centos-binary-data:latest
   DockerLibvirtImage: centos-binary-nova-libvirt:latest
-  DockerNeutronAgentImage: centos-binary-neutron-agents:latest
   DockerOpenvswitchImage: centos-binary-neutron-openvswitch-agent:latest
   DockerOvsVswitchdImage: centos-binary-openvswitch-vswitchd:latest
   DockerOpenvswitchDBImage: centos-binary-openvswitch-db-server:latest