aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-06 00:44:02 +0000
committerGerrit Code Review <review@openstack.org>2015-03-06 00:44:02 +0000
commitc3114b961086be034c6674a916361e2033c87986 (patch)
tree0a957c08d9d7c1505b53231d2cd52aef09bf4dc9 /docker/nova-compute
parenteaf15893a0af7fef1825601bedbd2704a291dd33 (diff)
parent0764fd7dea3f56627bb42e285cfb818cce08229e (diff)
downloadkolla-c3114b961086be034c6674a916361e2033c87986.tar.gz
kolla-c3114b961086be034c6674a916361e2033c87986.zip
Merge "Allow changing base image"
Diffstat (limited to 'docker/nova-compute')
-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
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile
index 7246e8937..8ef95eddc 100644
--- a/docker/nova-compute/nova-compute/Dockerfile
+++ b/docker/nova-compute/nova-compute/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-nova-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-compute sysfsutils \
diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile
index 0a7a7439a..7de4543f7 100644
--- a/docker/nova-compute/nova-libvirt/Dockerfile
+++ b/docker/nova-compute/nova-libvirt/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install libvirtd libguestfs qemu-system-x86 \
diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile
index 79c496b96..2ee4deff4 100644
--- a/docker/nova-compute/nova-network/Dockerfile
+++ b/docker/nova-compute/nova-network/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-nova-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-network \