From d30f69bc8327bf37e013c9647c99d9192eec8830 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Mon, 4 May 2015 17:26:30 -0700
Subject: [PATCH] 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
---
compose/glance-api-registry.yml | 4 ++--
compose/heat-api-cfn.yml | 2 +-
compose/heat-api-engine.yml | 6 +++---
compose/horizon.yml | 2 +-
compose/keystone.yml | 2 +-
compose/mariadb.yml | 4 ++--
compose/neutron-agents.yml | 2 +-
compose/neutron-server.yml | 2 +-
compose/nova-api-compute-network.yml | 10 +++++-----
compose/nova-api-conductor-scheduler.yml | 6 +++---
compose/nova-compute-network.yml | 8 ++++----
compose/nova-compute.yml | 6 +++---
compose/rabbitmq.yml | 2 +-
docker/barbican/Dockerfile | 2 +-
docker/ceilometer/ceilometer-alarm/Dockerfile | 2 +-
docker/ceilometer/ceilometer-api/Dockerfile | 2 +-
docker/ceilometer/ceilometer-base/Dockerfile | 2 +-
docker/ceilometer/ceilometer-central/Dockerfile | 2 +-
docker/ceilometer/ceilometer-collector/Dockerfile | 2 +-
docker/ceilometer/ceilometer-compute/Dockerfile | 2 +-
docker/ceilometer/ceilometer-notification/Dockerfile | 2 +-
docker/centos-rdo-base/Dockerfile | 6 +-----
docker/cinder/Dockerfile | 2 +-
docker/fedora-rdo-base/Dockerfile | 2 +-
docker/glance/glance-api/Dockerfile | 2 +-
docker/glance/glance-base/Dockerfile | 2 +-
docker/glance/glance-registry/Dockerfile | 2 +-
docker/heat/heat-api-cfn/Dockerfile | 2 +-
docker/heat/heat-api/Dockerfile | 2 +-
docker/heat/heat-base/Dockerfile | 2 +-
docker/heat/heat-engine/Dockerfile | 2 +-
docker/horizon/Dockerfile | 2 +-
docker/keystone/Dockerfile | 2 +-
docker/mariadb-app/Dockerfile | 2 +-
docker/mariadb-data/Dockerfile | 2 +-
docker/mongodb/Dockerfile | 2 +-
docker/neutron/neutron-agents/Dockerfile | 2 +-
docker/neutron/neutron-base/Dockerfile | 2 +-
docker/neutron/neutron-server/Dockerfile | 2 +-
docker/nova-base/Dockerfile | 2 +-
docker/nova-compute/nova-compute-data/Dockerfile | 2 +-
docker/nova-compute/nova-compute/Dockerfile | 2 +-
docker/nova-compute/nova-libvirt/Dockerfile | 2 +-
docker/nova-compute/nova-network/Dockerfile | 2 +-
docker/nova-controller/nova-api/Dockerfile | 2 +-
docker/nova-controller/nova-conductor/Dockerfile | 2 +-
docker/nova-controller/nova-scheduler/Dockerfile | 2 +-
docker/rabbitmq/Dockerfile | 2 +-
docker/swift/swift-account/Dockerfile | 2 +-
docker/swift/swift-base/Dockerfile | 2 +-
docker/swift/swift-container/Dockerfile | 2 +-
docker/swift/swift-object/Dockerfile | 2 +-
docker/swift/swift-proxy-server/Dockerfile | 2 +-
53 files changed, 68 insertions(+), 72 deletions(-)
diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml
index a3a419a259..c869ce293f 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 b97b54c0e7..fdc8762ab8 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 962c36348e..dd9afdeb51 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 f2767005c4..a44c1d9b9e 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 c4d7fb5a88..2806e7479d 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 4fce0c5501..b07544a73b 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 895624dffb..1999b36fe8 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 b2da8bd93b..e5aef6a481 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 fbb009baf4..28c6244249 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 2b5e05ceb5..ff17ec36aa 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 fe2e3b9fa4..d6690f632a 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 a5d0abe309..9200ac6dbf 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 da2de0d5c4..16ce7caa3f 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 fecb784132..c52cb828b9 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 fc8d7742ec..fe6c44fc2e 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 aaaf7c8df2..7a1337c7b1 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 ba2506e3a2..6aaf77ab2a 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 18ed633d69..bd5137306f 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 b654b2622f..6c54dce4ab 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 4b03c4f004..9f2a701d8e 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 1f8795645c..72d291bcb2 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 2b6c1d7f3e..963aadcf99 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 52f2119911..3dd7eca59b 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 f41cac97ed..96f2e49510 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 0ce10935ce..a4bd45bd1d 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 74b5c0e239..67b788fcca 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 e9937dc7f0..f950ce685e 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 2fa2ad5de1..18a7e369d0 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 76149b280b..407aee601d 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 4e5646b554..ebe9fa15c2 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 544830d060..227ac335d9 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 f153ef9968..ce925baf26 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 35e7315928..377ef7b4f6 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 692fd2bb05..dc40254548 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 627884a680..f60599d163 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 81278092fe..e05047f020 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 e083aa9b87..5d50bbfc1f 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 22922a04cb..c8a5ef2d9b 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 edd6ea559e..8d59dd04a2 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 efd260cda0..d116ac9730 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 07e26709da..0af407095b 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 079687c3a3..d23b86e5f9 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 8f7305a957..9809406152 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 11eb7effa7..2434dbdf02 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 12a2add20a..7abd32087d 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 d2bb00a820..f91113bad9 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 5190b10f6a..2eec475542 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 e269e1f42c..9212d15ebf 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 c3fe8d87aa..2c26802e38 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 965d65226b..59600a23d4 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 c3fe8d87aa..2c26802e38 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 c3fe8d87aa..2c26802e38 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 c3fe8d87aa..2c26802e38 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
--
GitLab