aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/source/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/source/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/source/cinder')
-rw-r--r--docker/centos/source/cinder/cinder-api/Dockerfile9
l---------docker/centos/source/cinder/cinder-api/build1
l---------docker/centos/source/cinder/cinder-api/config-external.sh1
l---------docker/centos/source/cinder/cinder-api/start.sh1
-rw-r--r--docker/centos/source/cinder/cinder-backup/Dockerfile7
l---------docker/centos/source/cinder/cinder-backup/build1
l---------docker/centos/source/cinder/cinder-backup/config-external.sh1
l---------docker/centos/source/cinder/cinder-backup/start.sh1
-rw-r--r--docker/centos/source/cinder/cinder-base/.buildinfo10
-rw-r--r--docker/centos/source/cinder/cinder-base/Dockerfile21
l---------docker/centos/source/cinder/cinder-base/build1
-rw-r--r--docker/centos/source/cinder/cinder-scheduler/Dockerfile7
l---------docker/centos/source/cinder/cinder-scheduler/build1
l---------docker/centos/source/cinder/cinder-scheduler/config-external.sh1
l---------docker/centos/source/cinder/cinder-scheduler/start.sh1
-rw-r--r--docker/centos/source/cinder/cinder-volume/Dockerfile14
l---------docker/centos/source/cinder/cinder-volume/build1
l---------docker/centos/source/cinder/cinder-volume/config-external.sh1
l---------docker/centos/source/cinder/cinder-volume/start.sh1
19 files changed, 0 insertions, 81 deletions
diff --git a/docker/centos/source/cinder/cinder-api/Dockerfile b/docker/centos/source/cinder/cinder-api/Dockerfile
deleted file mode 100644
index 99200d910..000000000
--- a/docker/centos/source/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 pip install python-keystoneclient
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/source/cinder/cinder-api/build b/docker/centos/source/cinder/cinder-api/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder/cinder-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-api/config-external.sh b/docker/centos/source/cinder/cinder-api/config-external.sh
deleted file mode 120000
index 0e9409e98..000000000
--- a/docker/centos/source/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/source/cinder/cinder-api/start.sh b/docker/centos/source/cinder/cinder-api/start.sh
deleted file mode 120000
index 4b6c5f104..000000000
--- a/docker/centos/source/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/source/cinder/cinder-backup/Dockerfile b/docker/centos/source/cinder/cinder-backup/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/source/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/source/cinder/cinder-backup/build b/docker/centos/source/cinder/cinder-backup/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder/cinder-backup/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-backup/config-external.sh b/docker/centos/source/cinder/cinder-backup/config-external.sh
deleted file mode 120000
index 4c6f65d40..000000000
--- a/docker/centos/source/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/source/cinder/cinder-backup/start.sh b/docker/centos/source/cinder/cinder-backup/start.sh
deleted file mode 120000
index 62ae41b03..000000000
--- a/docker/centos/source/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/source/cinder/cinder-base/.buildinfo b/docker/centos/source/cinder/cinder-base/.buildinfo
deleted file mode 100644
index 05cb8abab..000000000
--- a/docker/centos/source/cinder/cinder-base/.buildinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build info specific to this image. All values can be overridden in .buildconf
-
-COMPONENT=cinder
-SOURCE_INSTALL_AVAILABLE=1
-
-# Used for git install method
-: ${CLONE_FROM:=https://github.com/openstack/cinder}
-
-# Used for curl install method
-: ${TARBALL_URI:=http://tarballs.openstack.org/cinder/cinder-master.tar.gz}
diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile
deleted file mode 100644
index 209895b17..000000000
--- a/docker/centos/source/cinder/cinder-base/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-ADD ./cinder.tar /
-RUN ln -s /cinder-* /cinder
-
-RUN yum -y install lvm2 \
- && yum clean all \
- && cd /cinder \
- && useradd --user-group cinder \
- && pip install -r requirements.txt \
- && pip install /cinder \
- && mkdir /etc/cinder /var/log/cinder \
- && cp -r /cinder/etc/cinder/* /etc/cinder/ \
- && chown -R cinder: /etc/cinder /var/log/cinder \
- && rm -rf /root/.cache \
- && 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
-
-# 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/source/cinder/cinder-base/build b/docker/centos/source/cinder/cinder-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder/cinder-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/Dockerfile b/docker/centos/source/cinder/cinder-scheduler/Dockerfile
deleted file mode 100644
index 70b8d8202..000000000
--- a/docker/centos/source/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/source/cinder/cinder-scheduler/build b/docker/centos/source/cinder/cinder-scheduler/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder/cinder-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-scheduler/config-external.sh b/docker/centos/source/cinder/cinder-scheduler/config-external.sh
deleted file mode 120000
index f6d26aba5..000000000
--- a/docker/centos/source/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/source/cinder/cinder-scheduler/start.sh b/docker/centos/source/cinder/cinder-scheduler/start.sh
deleted file mode 120000
index 0953c6457..000000000
--- a/docker/centos/source/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/source/cinder/cinder-volume/Dockerfile b/docker/centos/source/cinder/cinder-volume/Dockerfile
deleted file mode 100644
index c7d6c9446..000000000
--- a/docker/centos/source/cinder/cinder-volume/Dockerfile
+++ /dev/null
@@ -1,14 +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/source/cinder/cinder-volume/build b/docker/centos/source/cinder/cinder-volume/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/source/cinder/cinder-volume/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/cinder/cinder-volume/config-external.sh b/docker/centos/source/cinder/cinder-volume/config-external.sh
deleted file mode 120000
index abcdd6bc4..000000000
--- a/docker/centos/source/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/source/cinder/cinder-volume/start.sh b/docker/centos/source/cinder/cinder-volume/start.sh
deleted file mode 120000
index 471a5ebd7..000000000
--- a/docker/centos/source/cinder/cinder-volume/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/cinder/cinder-volume/start.sh \ No newline at end of file