diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-12 19:38:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-12 19:38:46 +0000 |
| commit | 544c00b4975d86b1d4a6a5cd5b923073c99d1ece (patch) | |
| tree | 4bd1a959039fc4d83c14caca5db04efc2b7bdcd6 /docker/base | |
| parent | 35e379a97c5b272a9be9266e1e5b0703639a259b (diff) | |
| parent | 184f01a0d645d58fd4c9b6c5004e94fe98a077f8 (diff) | |
| download | kolla-544c00b4975d86b1d4a6a5cd5b923073c99d1ece.tar.gz kolla-544c00b4975d86b1d4a6a5cd5b923073c99d1ece.zip | |
Merge "Adds iscsid and tgtd docker containers"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 34bfac9f9..cddca0b65 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -140,6 +140,9 @@ RUN yum install -y \ python-jinja2 \ python-kazoo \ python-six \ + lvm2 \ + scsi-target-utils \ + iscsi-initiator-utils \ && yum clean all {% endif %} @@ -156,6 +159,9 @@ RUN yum -y install \ sudo \ tar \ which \ + lvm2 \ + scsi-target-utils \ + iscsi-initiator-utils \ && yum clean all {% endif %} @@ -187,6 +193,9 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 199369E540 python-kazoo \ python-six \ curl \ + open-iscsi \ + tgt \ + lvm2 \ && apt-get clean \ && sed -i "s|'purelib': '\$base/local/lib/python\$py_version_short/dist-packages',|'purelib': '\$base/lib/python\$py_version_short/dist-packages',|;s|'platlib': '\$platbase/local/lib/python\$py_version_short/dist-packages',|'platlib': '\$platbase/lib/python\$py_version_short/dist-packages',|;s|'headers': '\$base/local/include/python\$py_version_short/\$dist_name',|'headers': '\$base/include/python\$py_version_short/\$dist_name',|;s|'scripts': '\$base/local/bin',|'scripts': '\$base/bin',|;s|'data' : '\$base/local',|'data' : '\$base',|" /usr/lib/python2.7/distutils/command/install.py \ && rm -rf /usr/lib/python2.7/site-packages \ |