Merge "Allows for customization of NetworkDeployment actions"

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

diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml
index d579136..23f318b 100644 (file)
--- a/environments/docker-rdo.yaml
+++ b/environments/docker-rdo.yaml
@@ -5,13 +5,20 @@ resource_registry:
   OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
 
 parameters:
-  NovaImage: fedora-atomic
+  NovaImage: atomic-image
 
+# FIXME: When Kolla cuts liberty tag we can use kollaglue registry
 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 kollaglue.  Specify a local docker registry
+  # Example: 192.168.122.131:8787
+  DockerNamespace: kollaglue
+  # Enable local Docker registry
+  DockerNamespaceIsRegistry: false
+  # Compute Node Images
+  DockerComputeImage: centos-binary-nova-compute:liberty
+  DockerComputeDataImage: centos-binary-data:liberty
+  DockerLibvirtImage: centos-binary-nova-libvirt:liberty
+  DockerNeutronAgentImage: centos-binary-neutron-agents:liberty
+  DockerOpenvswitchImage: centos-binary-neutron-openvswitch-agent:liberty
+  DockerOvsVswitchdImage: centos-binary-openvswitch-vswitchd:liberty
+  DockerOpenvswitchDBImage: centos-binary-openvswitch-db-server:liberty