From 4008ca8619a83ac4ee9c56cb37f42b208d753823 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 9 Jul 2015 07:49:28 -0700 Subject: Start tgtd in cinder-volume container The tgtd process was not being started in the cinder-volume container. This results in iSCSI not being avialable for Cinder to operate against. Unfortunately cinder doesn't report the problem because LVM is responsible for the iSCSI mapping. Co-Authored-By: Ryan Hallisey Closes-Bug: 1473090 Closes-Bug: 1469323 Change-Id: Ie3403c5c3f81beb48960e838b4274e0c5796e387 --- docker/centos/binary/cinder-app/cinder-volume/Dockerfile | 9 +-------- docker/centos/binary/cinder-app/cinder-volume/tgtd.sh | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) create mode 120000 docker/centos/binary/cinder-app/cinder-volume/tgtd.sh (limited to 'docker/centos/binary') 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 -- cgit v1.2.3