From ec272b8fe4da85351d549022829c6a2329666376 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 7 Aug 2015 09:02:07 -0700 Subject: Remove config-internal from cinder Partially-Implements: blueprint remove-config-internal Change-Id: Ic6b7cb217a126c53c0055dbcac4d345583599eb1 --- docker/centos/source/cinder-app/cinder-api/Dockerfile | 2 +- docker/centos/source/cinder-app/cinder-api/config-internal.sh | 1 - docker/centos/source/cinder-app/cinder-backup/Dockerfile | 2 +- docker/centos/source/cinder-app/cinder-backup/config-internal.sh | 1 - docker/centos/source/cinder-app/cinder-base/Dockerfile | 3 --- docker/centos/source/cinder-app/cinder-base/config-cinder.sh | 1 - docker/centos/source/cinder-app/cinder-scheduler/Dockerfile | 2 +- docker/centos/source/cinder-app/cinder-scheduler/config-internal.sh | 1 - docker/centos/source/cinder-app/cinder-volume/Dockerfile | 2 +- docker/centos/source/cinder-app/cinder-volume/config-internal.sh | 1 - docker/centos/source/cinder-app/cinder-volume/tgtd.sh | 1 - docker/centos/source/cinder-app/cinder-volume/volume-group-create.sh | 1 - 12 files changed, 4 insertions(+), 14 deletions(-) delete mode 120000 docker/centos/source/cinder-app/cinder-api/config-internal.sh delete mode 120000 docker/centos/source/cinder-app/cinder-backup/config-internal.sh delete mode 120000 docker/centos/source/cinder-app/cinder-base/config-cinder.sh delete mode 120000 docker/centos/source/cinder-app/cinder-scheduler/config-internal.sh delete mode 120000 docker/centos/source/cinder-app/cinder-volume/config-internal.sh delete mode 120000 docker/centos/source/cinder-app/cinder-volume/tgtd.sh delete mode 120000 docker/centos/source/cinder-app/cinder-volume/volume-group-create.sh (limited to 'docker/centos/source') diff --git a/docker/centos/source/cinder-app/cinder-api/Dockerfile b/docker/centos/source/cinder-app/cinder-api/Dockerfile index 8ac5053de..3ce612046 100644 --- a/docker/centos/source/cinder-app/cinder-api/Dockerfile +++ b/docker/centos/source/cinder-app/cinder-api/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN pip install python-keystoneclient -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ COPY ./start.sh ./check.sh / CMD ["/start.sh"] diff --git a/docker/centos/source/cinder-app/cinder-api/config-internal.sh b/docker/centos/source/cinder-app/cinder-api/config-internal.sh deleted file mode 120000 index d929c89b2..000000000 --- a/docker/centos/source/cinder-app/cinder-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder-app/cinder-api/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/cinder-app/cinder-backup/Dockerfile b/docker/centos/source/cinder-app/cinder-backup/Dockerfile index 43994f123..70b8d8202 100644 --- a/docker/centos/source/cinder-app/cinder-backup/Dockerfile +++ b/docker/centos/source/cinder-app/cinder-backup/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/cinder-app/cinder-backup/config-internal.sh b/docker/centos/source/cinder-app/cinder-backup/config-internal.sh deleted file mode 120000 index 5f135c63b..000000000 --- a/docker/centos/source/cinder-app/cinder-backup/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder-app/cinder-backup/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/cinder-app/cinder-base/Dockerfile b/docker/centos/source/cinder-app/cinder-base/Dockerfile index 2c1d33977..dd6d8a5bf 100644 --- a/docker/centos/source/cinder-app/cinder-base/Dockerfile +++ b/docker/centos/source/cinder-app/cinder-base/Dockerfile @@ -14,6 +14,3 @@ RUN cd /cinder \ && cp /etc/cinder/cinder.conf.sample /etc/cinder/cinder.conf \ && chown -R cinder: /etc/cinder /var/log/cinder \ && rm -rf /root/.cache - -COPY config-cinder.sh /opt/kolla/config-cinder.sh - diff --git a/docker/centos/source/cinder-app/cinder-base/config-cinder.sh b/docker/centos/source/cinder-app/cinder-base/config-cinder.sh deleted file mode 120000 index 22722c185..000000000 --- a/docker/centos/source/cinder-app/cinder-base/config-cinder.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder-app/cinder-base/config-cinder.sh \ No newline at end of file diff --git a/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile b/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile index 43994f123..70b8d8202 100644 --- a/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile +++ b/docker/centos/source/cinder-app/cinder-scheduler/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/cinder-app/cinder-scheduler/config-internal.sh b/docker/centos/source/cinder-app/cinder-scheduler/config-internal.sh deleted file mode 120000 index f3792cd9c..000000000 --- a/docker/centos/source/cinder-app/cinder-scheduler/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder-app/cinder-scheduler/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/cinder-app/cinder-volume/Dockerfile b/docker/centos/source/cinder-app/cinder-volume/Dockerfile index 83ce3f604..c7d6c9446 100644 --- a/docker/centos/source/cinder-app/cinder-volume/Dockerfile +++ b/docker/centos/source/cinder-app/cinder-volume/Dockerfile @@ -8,7 +8,7 @@ RUN yum install -y \ && yum clean all # Add start scripts -COPY tgtd.sh volume-group-create.sh config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ COPY start.sh /start.sh CMD ["/start.sh"] diff --git a/docker/centos/source/cinder-app/cinder-volume/config-internal.sh b/docker/centos/source/cinder-app/cinder-volume/config-internal.sh deleted file mode 120000 index 4739be2fc..000000000 --- a/docker/centos/source/cinder-app/cinder-volume/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder-app/cinder-volume/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/cinder-app/cinder-volume/tgtd.sh b/docker/centos/source/cinder-app/cinder-volume/tgtd.sh deleted file mode 120000 index f0c885577..000000000 --- a/docker/centos/source/cinder-app/cinder-volume/tgtd.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder-app/cinder-volume/tgtd.sh \ No newline at end of file diff --git a/docker/centos/source/cinder-app/cinder-volume/volume-group-create.sh b/docker/centos/source/cinder-app/cinder-volume/volume-group-create.sh deleted file mode 120000 index eeeca7063..000000000 --- a/docker/centos/source/cinder-app/cinder-volume/volume-group-create.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder-app/cinder-volume/volume-group-create.sh \ No newline at end of file -- cgit v1.2.3