summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-20 17:28:48 +0000
committerGerrit Code Review <review@openstack.org>2015-11-20 17:28:48 +0000
commit159e78db986257d7b0f3e7e28d26d9d283135fea (patch)
treeac4ce8fbba3290a1fa28f085fc4fdf1f4a98ca57 /environments
parent338a2bcfb30aa4aa1660e4eadf3d52c2e09a23c3 (diff)
parent092bcd9283db3379cc2ccc50499e7904d9647c25 (diff)
Merge "Add local docker registry support"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker-rdo.yaml20
1 files changed, 13 insertions, 7 deletions
diff --git a/environments/docker-rdo.yaml b/environments/docker-rdo.yaml
index f42dc58a..23f318bf 100644
--- a/environments/docker-rdo.yaml
+++ b/environments/docker-rdo.yaml
@@ -9,10 +9,16 @@ parameters:
# FIXME: When Kolla cuts liberty tag we can use kollaglue registry
parameter_defaults:
- DockerComputeImage: rthallisey/centos-binary-nova-compute:liberty
- 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
+ # 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