diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-17 15:32:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-17 15:32:42 +0000 |
| commit | a6ccb90922cb8eec0eff84a0dd38e17ad03a84b0 (patch) | |
| tree | a7bc61f6abc809e7a0d75035c662c47dd70a57e2 /docker/centos/binary | |
| parent | a5b6b2f0d7a7474280fee554599cd0a3b451e241 (diff) | |
| parent | 4008ca8619a83ac4ee9c56cb37f42b208d753823 (diff) | |
| download | kolla-a6ccb90922cb8eec0eff84a0dd38e17ad03a84b0.tar.gz kolla-a6ccb90922cb8eec0eff84a0dd38e17ad03a84b0.zip | |
Merge "Start tgtd in cinder-volume container"
Diffstat (limited to 'docker/centos/binary')
| -rw-r--r-- | docker/centos/binary/cinder-app/cinder-volume/Dockerfile | 9 | ||||
| l--------- | docker/centos/binary/cinder-app/cinder-volume/tgtd.sh | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/centos/binary/cinder-app/cinder-volume/Dockerfile b/docker/centos/binary/cinder-app/cinder-volume/Dockerfile index 0daf6d29e..581f9e03a 100644 --- a/docker/centos/binary/cinder-app/cinder-volume/Dockerfile +++ b/docker/centos/binary/cinder-app/cinder-volume/Dockerfile @@ -2,17 +2,10 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages -# https://bugs.launchpad.net/kolla/+bug/1460129 -# Iscsi will be removed from cinder-volume in a later patch -# so that we continue to follow the container best practices. -# There will also be other backends for cinder and iscsi should -# not be hardcoded here. RUN yum install -y lvm2 scsi-target-utils && yum clean all # Add start scripts +COPY tgtd.sh volume-group-create.sh config-internal.sh config-external.sh /opt/kolla/ COPY start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ -COPY volume-group-create.sh /opt/kolla/volume-group-create.sh -# Start supervisor CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder-app/cinder-volume/tgtd.sh b/docker/centos/binary/cinder-app/cinder-volume/tgtd.sh new file mode 120000 index 000000000..f0c885577 --- /dev/null +++ b/docker/centos/binary/cinder-app/cinder-volume/tgtd.sh @@ -0,0 +1 @@ +../../../../common/cinder-app/cinder-volume/tgtd.sh
\ No newline at end of file |