aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary/cinder
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 19:23:49 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:30 -0700
commitf895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch)
treecc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/centos/binary/cinder
parent5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff)
downloadkolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz
kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip
Remove docker directory
Remove the docker directory (yay) and old build tools. This will result in an f21 failing gate - however, I have a patch submission to remove that gate from our project configuration. Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/centos/binary/cinder')
-rw-r--r--docker/centos/binary/cinder/cinder-api/Dockerfile9
l---------docker/centos/binary/cinder/cinder-api/build1
l---------docker/centos/binary/cinder/cinder-api/config-external.sh1
l---------docker/centos/binary/cinder/cinder-api/start.sh1
-rw-r--r--docker/centos/binary/cinder/cinder-backup/Dockerfile7
l---------docker/centos/binary/cinder/cinder-backup/build1
l---------docker/centos/binary/cinder/cinder-backup/config-external.sh1
l---------docker/centos/binary/cinder/cinder-backup/start.sh1
-rw-r--r--docker/centos/binary/cinder/cinder-base/Dockerfile11
l---------docker/centos/binary/cinder/cinder-base/build1
-rw-r--r--docker/centos/binary/cinder/cinder-scheduler/Dockerfile7
l---------docker/centos/binary/cinder/cinder-scheduler/build1
l---------docker/centos/binary/cinder/cinder-scheduler/config-external.sh1
l---------docker/centos/binary/cinder/cinder-scheduler/start.sh1
-rw-r--r--docker/centos/binary/cinder/cinder-volume/Dockerfile11
l---------docker/centos/binary/cinder/cinder-volume/build1
l---------docker/centos/binary/cinder/cinder-volume/config-external.sh1
l---------docker/centos/binary/cinder/cinder-volume/start.sh1
18 files changed, 0 insertions, 58 deletions
diff --git a/docker/centos/binary/cinder/cinder-api/Dockerfile b/docker/centos/binary/cinder/cinder-api/Dockerfile
deleted file mode 100644
index 7eed0b311..000000000
--- a/docker/centos/binary/cinder/cinder-api/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y python-keystone && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-api/build b/docker/centos/binary/cinder/cinder-api/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/cinder/cinder-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-api/config-external.sh b/docker/centos/binary/cinder/cinder-api/config-external.sh
deleted file mode 120000
index 0e9409e98..000000000
--- a/docker/centos/binary/cinder/cinder-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-api/start.sh b/docker/centos/binary/cinder/cinder-api/start.sh
deleted file mode 120000
index 4b6c5f104..000000000
--- a/docker/centos/binary/cinder/cinder-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-api/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-backup/Dockerfile b/docker/centos/binary/cinder/cinder-backup/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/binary/cinder/cinder-backup/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-backup/build b/docker/centos/binary/cinder/cinder-backup/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/cinder/cinder-backup/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-backup/config-external.sh b/docker/centos/binary/cinder/cinder-backup/config-external.sh
deleted file mode 120000
index 4c6f65d40..000000000
--- a/docker/centos/binary/cinder/cinder-backup/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-backup/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-backup/start.sh b/docker/centos/binary/cinder/cinder-backup/start.sh
deleted file mode 120000
index 62ae41b03..000000000
--- a/docker/centos/binary/cinder/cinder-backup/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-backup/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-base/Dockerfile b/docker/centos/binary/cinder/cinder-base/Dockerfile
deleted file mode 100644
index 6b699dae5..000000000
--- a/docker/centos/binary/cinder/cinder-base/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-cinder \
- python-automaton \
- && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
- && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf \
- && yum clean all
-
-# NOTE(sdake): The sed operations make LVM tools work inside a container - see
-# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
diff --git a/docker/centos/binary/cinder/cinder-base/build b/docker/centos/binary/cinder/cinder-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/cinder/cinder-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-scheduler/Dockerfile b/docker/centos/binary/cinder/cinder-scheduler/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-scheduler/build b/docker/centos/binary/cinder/cinder-scheduler/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-scheduler/config-external.sh b/docker/centos/binary/cinder/cinder-scheduler/config-external.sh
deleted file mode 120000
index f6d26aba5..000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-scheduler/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-scheduler/start.sh b/docker/centos/binary/cinder/cinder-scheduler/start.sh
deleted file mode 120000
index 0953c6457..000000000
--- a/docker/centos/binary/cinder/cinder-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-scheduler/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-volume/Dockerfile b/docker/centos/binary/cinder/cinder-volume/Dockerfile
deleted file mode 100644
index 17412fefa..000000000
--- a/docker/centos/binary/cinder/cinder-volume/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# Install required packages
-RUN yum install -y lvm2 scsi-target-utils && yum clean all
-
-# Add start scripts
-COPY config-external.sh /opt/kolla/
-COPY start.sh /start.sh
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/cinder/cinder-volume/build b/docker/centos/binary/cinder/cinder-volume/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/cinder/cinder-volume/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-volume/config-external.sh b/docker/centos/binary/cinder/cinder-volume/config-external.sh
deleted file mode 120000
index abcdd6bc4..000000000
--- a/docker/centos/binary/cinder/cinder-volume/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-volume/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/cinder/cinder-volume/start.sh b/docker/centos/binary/cinder/cinder-volume/start.sh
deleted file mode 120000
index 471a5ebd7..000000000
--- a/docker/centos/binary/cinder/cinder-volume/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-volume/start.sh \ No newline at end of file