aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-controller
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-10-16 13:44:27 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-10-16 13:49:48 -0400
commitbd885521ec64d87ebed4a438b13513858214e94e (patch)
tree9c0e617eaf92968c8908dcd796459abc0e8940df /docker/nova-controller
parentb4560bd0e3e8905bba544cbb95a9dab11f1a8a15 (diff)
downloadkolla-bd885521ec64d87ebed4a438b13513858214e94e.tar.gz
kolla-bd885521ec64d87ebed4a438b13513858214e94e.zip
renamed nova-controller -> nova-ctr-base
there is a 31 character limit on image names in docker hub. Change-Id: I9624668fc2f09c397084eadf792d4d0cc8486ae1
Diffstat (limited to 'docker/nova-controller')
-rw-r--r--docker/nova-controller/nova-api/Dockerfile2
-rw-r--r--docker/nova-controller/nova-conductor/Dockerfile2
-rw-r--r--docker/nova-controller/nova-ctr-base/Dockerfile (renamed from docker/nova-controller/nova-controller/Dockerfile)0
l---------docker/nova-controller/nova-ctr-base/build (renamed from docker/nova-controller/nova-controller/build)0
-rw-r--r--docker/nova-controller/nova-ctr-base/config-nova-controller.sh (renamed from docker/nova-controller/nova-controller/config-nova-controller.sh)0
-rw-r--r--docker/nova-controller/nova-ctr-base/nova.conf (renamed from docker/nova-controller/nova-controller/nova.conf)0
-rw-r--r--docker/nova-controller/nova-scheduler/Dockerfile2
7 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile
index d20a9ad36..23e4c076f 100644
--- a/docker/nova-controller/nova-api/Dockerfile
+++ b/docker/nova-controller/nova-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-nova-controller
+FROM kollaglue/fedora-rdo-nova-ctr-base
MAINTAINER Ryan Hallisey <rhallise@redhat.com>
RUN yum -y install \
diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/nova-controller/nova-conductor/Dockerfile
index 32d1e71ee..881081690 100644
--- a/docker/nova-controller/nova-conductor/Dockerfile
+++ b/docker/nova-controller/nova-conductor/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-nova-controller
+FROM kollaglue/fedora-rdo-nova-ctr-base
MAINTAINER Ryan Hallisey <rhallisey@redhat.com>
RUN yum -y install \
diff --git a/docker/nova-controller/nova-controller/Dockerfile b/docker/nova-controller/nova-ctr-base/Dockerfile
index bad079994..bad079994 100644
--- a/docker/nova-controller/nova-controller/Dockerfile
+++ b/docker/nova-controller/nova-ctr-base/Dockerfile
diff --git a/docker/nova-controller/nova-controller/build b/docker/nova-controller/nova-ctr-base/build
index 43944faa0..43944faa0 120000
--- a/docker/nova-controller/nova-controller/build
+++ b/docker/nova-controller/nova-ctr-base/build
diff --git a/docker/nova-controller/nova-controller/config-nova-controller.sh b/docker/nova-controller/nova-ctr-base/config-nova-controller.sh
index efd55d64e..efd55d64e 100644
--- a/docker/nova-controller/nova-controller/config-nova-controller.sh
+++ b/docker/nova-controller/nova-ctr-base/config-nova-controller.sh
diff --git a/docker/nova-controller/nova-controller/nova.conf b/docker/nova-controller/nova-ctr-base/nova.conf
index 0c29bd683..0c29bd683 100644
--- a/docker/nova-controller/nova-controller/nova.conf
+++ b/docker/nova-controller/nova-ctr-base/nova.conf
diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/nova-controller/nova-scheduler/Dockerfile
index 8b28875fc..4ff9b0b55 100644
--- a/docker/nova-controller/nova-scheduler/Dockerfile
+++ b/docker/nova-controller/nova-scheduler/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-nova-controller
+FROM kollaglue/fedora-rdo-nova-ctr-base
MAINTAINER Ryan Hallisey <rhallise@redhat.com>
RUN yum -y install \