summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-20 17:26:46 +0000
committerGerrit Code Review <review@openstack.org>2015-11-20 17:26:46 +0000
commit338a2bcfb30aa4aa1660e4eadf3d52c2e09a23c3 (patch)
treeef04f6034c4480bbcff3386baebdd64014181bc3 /environments
parentf6ff1a819190877093a90fb97ef7c9c8f6ce5164 (diff)
parent3a9186d6585d13528bf904a40556242c02ba4233 (diff)
Merge "Update docker compute environment to use json config"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker-rdo.yaml13
1 files changed, 7 insertions, 6 deletions
diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml
index 8a6e1018..f42dc58a 100644
--- a/environments/docker-rdo.yaml
+++ b/environments/docker-rdo.yaml
@@ -7,11 +7,12 @@ resource_registry:
parameters:
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
+ DockerComputeDataImage: rthallisey/centos-binary-data:liberty
+ DockerLibvirtImage: rthallisey/centos-binary-nova-libvirt:liberty
+ DockerNeutronAgentImage: rthallisey/centos-binary-neutron-agents:liberty
+ DockerOpenvswitchImage: rthallisey/centos-binary-neutron-openvswitch-agent:liberty
+ DockerOvsVswitchdImage: rthallisey/centos-binary-openvswitch-vswitchd:liberty
+ DockerOpenvswitchDBImage: rthallisey/centos-binary-openvswitch-db-server:liberty