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/nova | |
| 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/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 7be99a12c..72709cd94 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -10,6 +10,9 @@ RUN yum -y install \ sysfsutils \ ceph-common \ genisoimage \ + iscsi-initiator-utils \ + targetcli \ + python-rtslib \ && yum clean all {% elif base_distro in ['ubuntu'] %} @@ -23,6 +26,9 @@ RUN apt-get install -y --no-install-recommends \ ironic-common \ python-ironicclient \ genisoimage \ + open-iscsi \ + targetcli \ + python-rtslib \ && apt-get clean \ && rm -f /etc/nova/nova-compute.conf @@ -37,6 +43,9 @@ RUN yum -y install \ sysfsutils \ ceph-common \ genisoimage \ + iscsi-initiator-utils \ + targetcli \ + python-rtslib \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} @@ -46,6 +55,9 @@ RUN apt-get install -y --no-install-recommends \ qemu-utils \ ceph-common \ genisoimage \ + open-iscsi \ + targetcli \ + python-rtslib \ && apt-get clean \ && mkdir -p /etc/ceph @@ -59,6 +71,8 @@ COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \ && rm -f /etc/machine-id +ENV PATH $PATH:/lib/udev + {{ include_footer }} USER nova |