summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-24 10:21:16 +0000
committerGerrit Code Review <review@openstack.org>2015-11-24 10:21:16 +0000
commit7bae1ce8b0de5108e5219d2cadb712425eaf0f87 (patch)
tree10e512113797dd2d4dc1e7562f128d6a942981d1
parentd40eb03ac29f9f61f49ee2709b660c06eb60f503 (diff)
parent0eafa814d53cb3f0ed9f2db526c7eb58aa2e2f2f (diff)
Merge "Point registry at tripleoupstream"
-rw-r--r--docker/compute-post.yaml2
-rw-r--r--environments/docker-rdo.yaml19
2 files changed, 10 insertions, 11 deletions
diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 1dc7be16..a6607fd9 100644
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -11,7 +11,7 @@ parameters:
description: Value which changes if the node configuration may need to be re-applied
DockerNamespace:
type: string
- default: kollaglue
+ default: tripleoupstream
DockerComputeImage:
type: string
DockerComputeDataImage:
diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml
index 23f318bf..66824feb 100644
--- a/environments/docker-rdo.yaml
+++ b/environments/docker-rdo.yaml
@@ -7,18 +7,17 @@ resource_registry:
parameters:
NovaImage: atomic-image
-# FIXME: When Kolla cuts liberty tag we can use kollaglue registry
parameter_defaults:
- # Defaults to kollaglue. Specify a local docker registry
+ # Defaults to 'tripleoupstream'. Specify a local docker registry
# Example: 192.168.122.131:8787
- DockerNamespace: kollaglue
+ DockerNamespace: tripleoupstream
# 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
+ 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