Merge "Add SoftwareConfigTransport for switching transports"

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

diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml
index 8a6e101..66824fe 100644 (file)
--- a/environments/docker-rdo.yaml
+++ b/environments/docker-rdo.yaml
@@ -8,10 +8,16 @@ parameters:
   NovaImage: atomic-image
 
 parameter_defaults:
-  DockerComputeImage: rthallisey/centos-binary-nova-compute:liberty
-  DockerComputeDataImage: kollaglue/centos-rdo-nova-compute-data:liberty2
-  DockerLibvirtImage: kollaglue/centos-rdo-nova-libvirt:liberty2
-  DockerNeutronAgentImage: kollaglue/centos-rdo-neutron-agents:liberty2
-  DockerOpenvswitchImage: rthallisey/centos-rdo-neutron-openvswitch-agent:latest
-  DockerOvsVswitchdImage: kollaglue/centos-rdo-ovs-vswitchd:liberty2
-  DockerOpenvswitchDBImage: kollaglue/centos-rdo-ovs-db-server:liberty2
+  # Defaults to 'tripleoupstream'.  Specify a local docker registry
+  # Example: 192.168.122.131:8787
+  DockerNamespace: tripleoupstream
+  # Enable local Docker registry
+  DockerNamespaceIsRegistry: false
+  # Compute Node Images
+  DockerComputeImage: centos-binary-nova-compute: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