aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-compute
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-04 17:26:30 -0700
committerSteven Dake <stdake@cisco.com>2015-05-06 09:58:43 -0700
commitd30f69bc8327bf37e013c9647c99d9192eec8830 (patch)
treeb3f831de844ea86a011a14fca23f97ec72b63db9 /docker/nova-compute
parentd8a7af93eb7b05c74082526b23cb4347851d95cf (diff)
downloadkolla-d30f69bc8327bf37e013c9647c99d9192eec8830.tar.gz
kolla-d30f69bc8327bf37e013c9647c99d9192eec8830.zip
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
Diffstat (limited to 'docker/nova-compute')
-rw-r--r--docker/nova-compute/nova-compute-data/Dockerfile2
-rw-r--r--docker/nova-compute/nova-compute/Dockerfile2
-rw-r--r--docker/nova-compute/nova-libvirt/Dockerfile2
-rw-r--r--docker/nova-compute/nova-network/Dockerfile2
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/nova-compute/nova-compute-data/Dockerfile b/docker/nova-compute/nova-compute-data/Dockerfile
index 07e26709d..0af407095 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 079687c3a..d23b86e5f 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 8f7305a95..980940615 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 11eb7effa..2434dbdf0 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 \