Port to icehouse

This represents making build-docker-images --release build
with the icehouse tag and causes docker-compsoe to pull from
the icehouse tag.

Partially-implements: blueprint port-kilo

Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50

13 files changed, 28 insertions, 28 deletions

diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml
index a3a419a25..c869ce293 100644
--- a/compose/glance-api-registry.yml
+++ b/compose/glance-api-registry.yml
@@ -1,12 +1,12 @@
 glanceregistry:
-  image: kollaglue/centos-rdo-glance-registry
+  image: kollaglue/centos-rdo-glance-registry:icehouse
   name: glance-registry
   net: "host"
   restart: always
   env_file:
    - openstack.env
 glanceapi:
-  image: kollaglue/centos-rdo-glance-api
+  image: kollaglue/centos-rdo-glance-api:icehouse
   name: glance-api
   net: "host"
   restart: always
diff --git a/compose/heat-api-cfn.yml b/compose/heat-api-cfn.yml
index b97b54c0e..fdc8762ab 100644
--- a/compose/heat-api-cfn.yml
+++ b/compose/heat-api-cfn.yml
@@ -1,5 +1,5 @@
 heatapicfn:
-  image: kollaglue/centos-rdo-heat-api-cfn
+  image: kollaglue/centos-rdo-heat-api-cfn:icehouse
   name: heat-api-cfn
   net: "host"
   restart: always
diff --git a/compose/heat-api-engine.yml b/compose/heat-api-engine.yml
index 962c36348..dd9afdeb5 100644
--- a/compose/heat-api-engine.yml
+++ b/compose/heat-api-engine.yml
@@ -1,14 +1,14 @@
 heatapi:
-  image: kollaglue/centos-rdo-heat-api
+  image: kollaglue/centos-rdo-heat-api:icehouse
   name: heat-api
   net: "host"
   restart: always
   env_file:
    - openstack.env
 heatengine:
-  image: kollaglue/centos-rdo-heat-engine
+  image: kollaglue/centos-rdo-heat-engine:icehouse
   name: heat-engine
   net: "host"
   restart: always
   env_file:
-   - openstack.env
\ No newline at end of file
+   - openstack.env
diff --git a/compose/horizon.yml b/compose/horizon.yml
index f2767005c..a44c1d9b9 100644
--- a/compose/horizon.yml
+++ b/compose/horizon.yml
@@ -1,5 +1,5 @@
 horizon:
-  image: kollaglue/centos-rdo-horizon
+  image: kollaglue/centos-rdo-horizon:icehouse
   name: horizon
   net: "host"
   restart: always
diff --git a/compose/keystone.yml b/compose/keystone.yml
index c4d7fb5a8..2806e7479 100644
--- a/compose/keystone.yml
+++ b/compose/keystone.yml
@@ -1,5 +1,5 @@
 keystone:
-  image: kollaglue/centos-rdo-keystone
+  image: kollaglue/centos-rdo-keystone:icehouse
   name: keystone
   restart: always
   net: "host"
diff --git a/compose/mariadb.yml b/compose/mariadb.yml
index 4fce0c550..b07544a73 100644
--- a/compose/mariadb.yml
+++ b/compose/mariadb.yml
@@ -1,10 +1,10 @@
 mariadbdata:
-  image: kollaglue/centos-rdo-mariadb-data
+  image: kollaglue/centos-rdo-mariadb-data:icehouse
   name: mariadbdata
   restart: on-failure
 
 mariadbapp:
-  image: kollaglue/centos-rdo-mariadb-app
+  image: kollaglue/centos-rdo-mariadb-app:icehouse
   name: mariadbapp
   restart: always
   env_file:
diff --git a/compose/neutron-agents.yml b/compose/neutron-agents.yml
index 895624dff..1999b36fe 100644
--- a/compose/neutron-agents.yml
+++ b/compose/neutron-agents.yml
@@ -1,5 +1,5 @@
 neutronagents:
-  image: kollaglue/centos-rdo-neutron-agents:latest
+  image: kollaglue/centos-rdo-neutron-agents:icehouse
   name: neutron-agents
   net: "host"
   privileged: true
diff --git a/compose/neutron-server.yml b/compose/neutron-server.yml
index b2da8bd93..e5aef6a48 100644
--- a/compose/neutron-server.yml
+++ b/compose/neutron-server.yml
@@ -1,5 +1,5 @@
 neutronserver:
-  image: kollaglue/centos-rdo-neutron-server:latest
+  image: kollaglue/centos-rdo-neutron-server:icehouse
   name: neutron-server
   net: "host"
   restart: always
diff --git a/compose/nova-api-compute-network.yml b/compose/nova-api-compute-network.yml
index fbb009baf..28c624424 100644
--- a/compose/nova-api-compute-network.yml
+++ b/compose/nova-api-compute-network.yml
@@ -1,9 +1,9 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data
+   image: kollaglue/centos-rdo-nova-compute-data:icehouse
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt
+   image: kollaglue/centos-rdo-nova-libvirt:icehouse
    name: libvirt
    net: host
    pid: host
@@ -19,7 +19,7 @@ libvirt:
     - computedata
 
 novanetwork:
-   image: kollaglue/centos-rdo-nova-network
+   image: kollaglue/centos-rdo-nova-network:icehouse
    name: nova-network
    net: host
    privileged: true
@@ -38,7 +38,7 @@ novanetwork:
 # nova-metadata api is required in multi_host nova network mode.
 # http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
 novaapi:
-  image: kollaglue/centos-rdo-nova-api:latest
+  image: kollaglue/centos-rdo-nova-api:icehouse
   name: nova-api
   privileged: True
   net: "host"
@@ -49,7 +49,7 @@ novaapi:
    - /lib/modules:/lib/modules:ro
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute
+   image: kollaglue/centos-rdo-nova-compute:icehouse
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/nova-api-conductor-scheduler.yml b/compose/nova-api-conductor-scheduler.yml
index 2b5e05ceb..ff17ec36a 100644
--- a/compose/nova-api-conductor-scheduler.yml
+++ b/compose/nova-api-conductor-scheduler.yml
@@ -1,5 +1,5 @@
 novaconductor:
-  image: kollaglue/centos-rdo-nova-conductor:latest
+  image: kollaglue/centos-rdo-nova-conductor:icehouse
   name: nova-conductor
   net: "host"
   restart: always
@@ -9,7 +9,7 @@ novaconductor:
 # Unfortunately nova api needs to be privileged as it wants to run
 # a firewall command.
 novaapi:
-  image: kollaglue/centos-rdo-nova-api:latest
+  image: kollaglue/centos-rdo-nova-api:icehouse
   name: nova-api
   privileged: True
   net: "host"
@@ -18,7 +18,7 @@ novaapi:
    - openstack.env
 
 novascheduler:
-  image: kollaglue/centos-rdo-nova-scheduler:latest
+  image: kollaglue/centos-rdo-nova-scheduler:icehouse
   name: nova-scheduler
   net: "host"
   restart: always
diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml
index fe2e3b9fa..d6690f632 100644
--- a/compose/nova-compute-network.yml
+++ b/compose/nova-compute-network.yml
@@ -1,9 +1,9 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data
+   image: kollaglue/centos-rdo-nova-compute-data:icehouse
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt
+   image: kollaglue/centos-rdo-nova-libvirt:icehouse
    name: libvirt
    net: host
    pid: host
@@ -18,7 +18,7 @@ libvirt:
     - computedata
 
 novanetwork:
-   image: kollaglue/centos-rdo-nova-network
+   image: kollaglue/centos-rdo-nova-network:icehouse
    name: nova-network
    net: host
    privileged: true
@@ -33,7 +33,7 @@ novanetwork:
     - computedata
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute
+   image: kollaglue/centos-rdo-nova-compute:icehouse
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/nova-compute.yml b/compose/nova-compute.yml
index a5d0abe30..9200ac6db 100644
--- a/compose/nova-compute.yml
+++ b/compose/nova-compute.yml
@@ -1,9 +1,9 @@
 computedata:
-   image: kollaglue/centos-rdo-nova-compute-data
+   image: kollaglue/centos-rdo-nova-compute-data:icehouse
    name: computedata
 
 libvirt:
-   image: kollaglue/centos-rdo-nova-libvirt
+   image: kollaglue/centos-rdo-nova-libvirt:icehouse
    name: libvirt
    net: host
    pid: host
@@ -19,7 +19,7 @@ libvirt:
     - computedata
 
 novacompute:
-   image: kollaglue/centos-rdo-nova-compute
+   image: kollaglue/centos-rdo-nova-compute:icehouse
    name: nova-compute
    net: host
    privileged: true
diff --git a/compose/rabbitmq.yml b/compose/rabbitmq.yml
index da2de0d5c..16ce7caa3 100644
--- a/compose/rabbitmq.yml
+++ b/compose/rabbitmq.yml
@@ -1,5 +1,5 @@
 rabbitmq:
-  image: kollaglue/centos-rdo-rabbitmq
+  image: kollaglue/centos-rdo-rabbitmq:icehouse
   name: rabbitmq
   restart: always
   net: "host"