diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml
index a3a419a259c7d9c38ab70127b8472fcf1637ea7e..c869ce293f6c095b58922248aaff403777c18138 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 b97b54c0e73d66bf2036ddd113f6a6345638daa2..fdc8762ab8541cd7732e9784e45595cba566f351 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 962c36348e3326a8fd13ef2df87050d09323eaf9..dd9afdeb51a60d0d2c14d657b9e881ae14f19f22 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 f2767005c47796b3bd82a42d80140fd2a0675d0a..a44c1d9b9e60249e575a17555eaa5cf4efba2c93 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 c4d7fb5a88763fbe9042fb3fc349d253af207624..2806e7479dfe07fcd1cb4717a7d7a64fadd9b668 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 4fce0c55018d9b33a973486a9dadfcab79f9ef81..b07544a73b2d40ce20644a913c3ab317ed2d1ba7 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 895624dffbc95d923da04830faaa8914c590bf40..1999b36fe8a0f936de2f94e07c12a62e14eed795 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 b2da8bd93b4e7d0651f6a9b2d582511c871f0465..e5aef6a481e3d00d4b9cdbcb628f0615f21f5729 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 fbb009baf4c3fc131af7b4ed81a54c76f379551d..28c6244249a9a105a3ecf99664c785b5504f3ad1 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 2b5e05ceb5d238c6b81dcfa5fcee828d34f61f75..ff17ec36aa5f7e85f98ce0a325a53cfdb832a91a 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 fe2e3b9fa4663d05eaf94337681afe28fa8743bf..d6690f632a70b6b1d044cea992610c7745ca4956 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 a5d0abe309990c87f9dd0c4aa7a4d36b0ec8d720..9200ac6dbf84003b1e1e8603d46a8eecf29ed2f4 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 da2de0d5c43578884698aaa8fa81c4f02c35847c..16ce7caa3fb097eb4abe7a64bcfdda2561fb723e 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"
diff --git a/docker/barbican/Dockerfile b/docker/barbican/Dockerfile
index fecb784132c0724b7e3fe7777d8622c3f005979c..c52cb828b930a6d94d11516da0f700112506b644 100644
--- a/docker/barbican/Dockerfile
+++ b/docker/barbican/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh
diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile b/docker/ceilometer/ceilometer-alarm/Dockerfile
index fc8d7742ec443c6196fbcc2d80b9d1a23163f0ae..fe6c44fc2e98aea499d16601a4978f94b598271b 100644
--- a/docker/ceilometer/ceilometer-alarm/Dockerfile
+++ b/docker/ceilometer/ceilometer-alarm/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile b/docker/ceilometer/ceilometer-api/Dockerfile
index aaaf7c8df2b29e493404f161776a7e6761492ccd..7a1337c7b19fa14df59efa2d8012a94b1b299f2b 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/ceilometer/ceilometer-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile b/docker/ceilometer/ceilometer-base/Dockerfile
index ba2506e3a20e50c7ef37cbde6b261bd97b03a917..6aaf77ab2a93bc01e5f76158d64dead66c030601 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile
+++ b/docker/ceilometer/ceilometer-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile b/docker/ceilometer/ceilometer-central/Dockerfile
index 18ed633d698bb4665975c9128fe155465af4b8d9..bd5137306fe38d937e7d09d7628b6ff188d5641c 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile
+++ b/docker/ceilometer/ceilometer-central/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile b/docker/ceilometer/ceilometer-collector/Dockerfile
index b654b2622f1552eb5babc6528f9dc1fac1064900..6c54dce4ab8c52832fbe7b996dfa80ac2bcc655b 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile b/docker/ceilometer/ceilometer-compute/Dockerfile
index 4b03c4f0042f411fbf6a1266830f93b2d1686f6b..9f2a701d8ef96e7b42decbc1ddd0284598a9a122 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile b/docker/ceilometer/ceilometer-notification/Dockerfile
index 1f8795645c9e453f26304af50a79acdab20de3c4..72d291bcb20c56c28688c9947d662502c672e726 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-notification && yum clean all
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile
index 2b6c1d7f3e074adfd7ed13f570f5dea900e535ec..963aadcf9922199d3ef6e37d412fd9586b25cd7c 100644
--- a/docker/centos-rdo-base/Dockerfile
+++ b/docker/centos-rdo-base/Dockerfile
@@ -2,14 +2,10 @@ FROM centos
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
-RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
+RUN yum -y install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm && yum clean all
RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo
RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo
-# CentOS 7.1 workaround
-
-RUN sed "s/Derived from Red Hat Enterprise Linux 7.1 (Source)/7/" "/etc/yum.repos.d/rdo-release.repo" -i
-
# CentOS 7.1 workaround for conflicting packages with libvirt
RUN rpm -e --nodeps systemd-container systemd-container-libs
RUN yum -y install systemd systemd-libs systemd-devel && yum clean all
diff --git a/docker/cinder/Dockerfile b/docker/cinder/Dockerfile
index 52f211991193d86407c9b169fc515164e88dd4e9..3dd7eca59b6ac2572f4435ff43b846eaff75e293 100644
--- a/docker/cinder/Dockerfile
+++ b/docker/cinder/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-cinder && yum clean all
diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile
index f41cac97edb8e3455815142f3a160294e0a854e9..96f2e495102cccb5d5b26ba0b3e9dc0ab44fc2a5 100644
--- a/docker/fedora-rdo-base/Dockerfile
+++ b/docker/fedora-rdo-base/Dockerfile
@@ -2,7 +2,7 @@ FROM fedora:20
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
-RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
+RUN yum -y install https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm
RUN yum -y install dnf dnf-plugins-core && yum clean all
RUN dnf copr enable -y larsks/crux
run dnf copr enable -y sdake/pam.noaudit
diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile
index 0ce10935ce0f0a7cdcf2b690bd75bfff0b0fe6dd..a4bd45bd1d8c3c027411a9e0b5be012f391a7caa 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME /var/lib/glance
diff --git a/docker/glance/glance-base/Dockerfile b/docker/glance/glance-base/Dockerfile
index 74b5c0e2396be3f9f0fd3a2ee7dabe68534dba46..67b788fccaf5bdb28227c7cb0979700f0524f932 100644
--- a/docker/glance/glance-base/Dockerfile
+++ b/docker/glance/glance-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-glance && yum clean all
diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile
index e9937dc7f0d6df8618c17649c908e4030400b9ff..f950ce685e775133b70672fb72cc6995853dd10f 100644
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/glance/glance-registry/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh
diff --git a/docker/heat/heat-api-cfn/Dockerfile b/docker/heat/heat-api-cfn/Dockerfile
index 2fa2ad5de117fd51381e600d2696eaee7e77d7e1..18a7e369d0f822774a5f7f64fdfd6ddc56e50ffc 100644
--- a/docker/heat/heat-api-cfn/Dockerfile
+++ b/docker/heat/heat-api-cfn/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
diff --git a/docker/heat/heat-api/Dockerfile b/docker/heat/heat-api/Dockerfile
index 76149b280b7d6cb5e6670a6fada00808df044caa..407aee601d032038806ab1d814de777a2c5ef99d 100644
--- a/docker/heat/heat-api/Dockerfile
+++ b/docker/heat/heat-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# TODO: configure cfn and cloudwatch
diff --git a/docker/heat/heat-base/Dockerfile b/docker/heat/heat-base/Dockerfile
index 4e5646b554953dc229fa2a4567012e130e3b83c1..ebe9fa15c2ccf4ca563098e0a49578593c5b8c88 100644
--- a/docker/heat/heat-base/Dockerfile
+++ b/docker/heat/heat-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla
diff --git a/docker/heat/heat-engine/Dockerfile b/docker/heat/heat-engine/Dockerfile
index 544830d060a5d534414ece53fb12a1d6d3fe83e3..227ac335d9eda9787622e850798acd90308c94cd 100644
--- a/docker/heat/heat-engine/Dockerfile
+++ b/docker/heat/heat-engine/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
diff --git a/docker/horizon/Dockerfile b/docker/horizon/Dockerfile
index f153ef9968fa510307a7ae2d646cc6b0347f93a4..ce925baf26397583708aa44bf71dae1a5cdd5471 100644
--- a/docker/horizon/Dockerfile
+++ b/docker/horizon/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-dashboard \
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 35e7315928f24da2ec87be80278fc0221b7969e4..377ef7b4f62ded7223d083c65f25332f66be71cf 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages
diff --git a/docker/mariadb-app/Dockerfile b/docker/mariadb-app/Dockerfile
index 692fd2bb053d4b9f47cb20eeca377f57e5cff3fe..dc40254548e930c3cea51252d0b7ad1d9271e1b8 100644
--- a/docker/mariadb-app/Dockerfile
+++ b/docker/mariadb-app/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install packages
diff --git a/docker/mariadb-data/Dockerfile b/docker/mariadb-data/Dockerfile
index 627884a680e4c8af7d7f91408c38db9137b25c21..f60599d163a6c739b250766773c5c7fcaa5d9ad2 100644
--- a/docker/mariadb-data/Dockerfile
+++ b/docker/mariadb-data/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME [ "/var/lib/mysql" ]
diff --git a/docker/mongodb/Dockerfile b/docker/mongodb/Dockerfile
index 81278092fef1795accbe8b7d280f0f0715ab57f8..e05047f02097965123569623fcae99608b373fce 100644
--- a/docker/mongodb/Dockerfile
+++ b/docker/mongodb/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install mongodb mongodb-server && yum clean all
diff --git a/docker/neutron/neutron-agents/Dockerfile b/docker/neutron/neutron-agents/Dockerfile
index e083aa9b87afdb2c2072385fa91e4a55bb2e8538..5d50bbfc1f513a28954293b321edfd5c64f27677 100644
--- a/docker/neutron/neutron-agents/Dockerfile
+++ b/docker/neutron/neutron-agents/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install supervisor
diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/neutron/neutron-base/Dockerfile
index 22922a04cba74c65cabf001708f827ac8cef3885..c8a5ef2d9b05d5c6476ab8719632c591e63a1ee9 100644
--- a/docker/neutron/neutron-base/Dockerfile
+++ b/docker/neutron/neutron-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-neutron-ml2 && yum clean all
diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/neutron/neutron-server/Dockerfile
index edd6ea559e6d33a515639e7e8754f38ae0b2c4cc..8d59dd04a28aa913063cad635dd550c8648ec0a7 100644
--- a/docker/neutron/neutron-server/Dockerfile
+++ b/docker/neutron/neutron-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages
diff --git a/docker/nova-base/Dockerfile b/docker/nova-base/Dockerfile
index efd260cda0c685ad200c6bde2558d7f522b2a9f1..d116ac973053c0cc0e16244ea2793d35bb3f4ecc 100644
--- a/docker/nova-base/Dockerfile
+++ b/docker/nova-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-common \
diff --git a/docker/nova-compute/nova-compute-data/Dockerfile b/docker/nova-compute/nova-compute-data/Dockerfile
index 07e26709da17fff93930cbf8cb73b9cece9ac983..0af407095b54bc8d3de7003873cc7b962261d8b6 100644
--- a/docker/nova-compute/nova-compute-data/Dockerfile
+++ b/docker/nova-compute/nova-compute-data/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME [ "/var/lib/nova" ]
diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile
index 079687c3a3073adc38dfc55bba89b943d5be55f5..d23b86e5f9a0fcfbcbfa3b6865c528ce45679709 100644
--- a/docker/nova-compute/nova-compute/Dockerfile
+++ b/docker/nova-compute/nova-compute/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-compute \
diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile
index 8f7305a957e7ab2ec22756043fd267f3135f4b6c..980940615221c2ca0f397aa7a5569b469ac0804a 100644
--- a/docker/nova-compute/nova-libvirt/Dockerfile
+++ b/docker/nova-compute/nova-libvirt/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install libvirt-daemon \
diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile
index 11eb7effa763857dd1875bc0c86bdc18b5c90d3c..2434dbdf02f1a15d66744abe83c5033708a1c57b 100644
--- a/docker/nova-compute/nova-network/Dockerfile
+++ b/docker/nova-compute/nova-network/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-network \
diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile
index 12a2add20a0a61becd6a19ec8496d3081021a240..7abd32087da3a5bafc216d600e7d2634deb89ef3 100644
--- a/docker/nova-controller/nova-api/Dockerfile
+++ b/docker/nova-controller/nova-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/nova-controller/nova-conductor/Dockerfile
index d2bb00a82058b94081aca1309520a1cf83c4dc4f..f91113bad95708ec2dd9cad96351e95c868e7263 100644
--- a/docker/nova-controller/nova-conductor/Dockerfile
+++ b/docker/nova-controller/nova-conductor/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/nova-controller/nova-scheduler/Dockerfile
index 5190b10f6a138bbeb5c1982420e5ad0e8876a9e7..2eec4755429bef3c90f50efa47a66bc0d4b9962a 100644
--- a/docker/nova-controller/nova-scheduler/Dockerfile
+++ b/docker/nova-controller/nova-scheduler/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
index e269e1f42cbe873d551c1c4894af20db684e7bbc..9212d15ebfee23008b432e3cefd8a00d2f1fba1c 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages
diff --git a/docker/swift/swift-account/Dockerfile b/docker/swift/swift-account/Dockerfile
index c3fe8d87aa8a1b0d93669dac23fc65f1c49a3dcb..2c26802e3888be8b511338cc8fa80c757ac82235 100644
--- a/docker/swift/swift-account/Dockerfile
+++ b/docker/swift/swift-account/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh
diff --git a/docker/swift/swift-base/Dockerfile b/docker/swift/swift-base/Dockerfile
index 965d65226b994ea259317a6b408ffdd325243f54..59600a23d46939f48d8a0820df39588f37a8286d 100644
--- a/docker/swift/swift-base/Dockerfile
+++ b/docker/swift/swift-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-utils openstack-swift && yum clean all
diff --git a/docker/swift/swift-container/Dockerfile b/docker/swift/swift-container/Dockerfile
index c3fe8d87aa8a1b0d93669dac23fc65f1c49a3dcb..2c26802e3888be8b511338cc8fa80c757ac82235 100644
--- a/docker/swift/swift-container/Dockerfile
+++ b/docker/swift/swift-container/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh
diff --git a/docker/swift/swift-object/Dockerfile b/docker/swift/swift-object/Dockerfile
index c3fe8d87aa8a1b0d93669dac23fc65f1c49a3dcb..2c26802e3888be8b511338cc8fa80c757ac82235 100644
--- a/docker/swift/swift-object/Dockerfile
+++ b/docker/swift/swift-object/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh
diff --git a/docker/swift/swift-proxy-server/Dockerfile b/docker/swift/swift-proxy-server/Dockerfile
index c3fe8d87aa8a1b0d93669dac23fc65f1c49a3dcb..2c26802e3888be8b511338cc8fa80c757ac82235 100644
--- a/docker/swift/swift-proxy-server/Dockerfile
+++ b/docker/swift/swift-proxy-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh