diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-24 14:20:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-24 14:20:53 +0000 |
| commit | f96c9ccac3938b67f12eddae576446979777f1cc (patch) | |
| tree | a30d323120f37fcd844a37a71329c28eca8030d1 /docker | |
| parent | 6a9681ba9b6a9581a0ac18a56a176aab13f9f55a (diff) | |
| parent | ebaf1f304240cfcc8201d13183782191cc210f28 (diff) | |
| download | kolla-f96c9ccac3938b67f12eddae576446979777f1cc.tar.gz kolla-f96c9ccac3938b67f12eddae576446979777f1cc.zip | |
Merge "handle rtslib(-fb) package names and dependencies"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/iscsid/Dockerfile.j2 | 17 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 40 |
2 files changed, 45 insertions, 12 deletions
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index b5538ad00..7c5401867 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -14,11 +14,22 @@ LABEL maintainer="{{ maintainer }}" {% elif base_distro in ['debian', 'ubuntu'] %} {% set iscsid_packages = [ - 'open-iscsi', - 'python-rtslib', - 'targetcli' + 'open-iscsi' ] %} + # Debian/stretch uses rtslib-fb (like CentOS does) + {% if base_distro == 'debian' %} + {% set iscsid_packages = iscsid_packages + [ + 'python-rtslib-fb', + 'targetcli-fb' + ] %} + {% elif base_distro == 'ubuntu' %} + {% set iscsid_packages = iscsid_packages + [ + 'python-rtslib', + 'targetcli' + ] %} + {% endif %} + {% endif %} {{ macros.install_packages(iscsid_packages | customizable("packages")) }} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index a2109dc7f..ca7b67eb4 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -15,10 +15,10 @@ LABEL maintainer="{{ maintainer }}" 'nfs-utils', 'openstack-nova-compute', 'openvswitch', + 'python-oslo-vmware', 'python-rtslib', 'sysfsutils', - 'targetcli', - 'python-oslo-vmware' + 'targetcli' ] %} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} @@ -35,12 +35,23 @@ LABEL maintainer="{{ maintainer }}" 'openvswitch-switch', 'open-iscsi', 'python-ironicclient', - 'python-rtslib', - 'sysfsutils', - 'targetcli', - 'python-oslo-vmware' + 'python-oslo-vmware', + 'sysfsutils' ] %} + # Debian/stretch uses rtslib-fb (like CentOS does) + {% if base_distro == 'debian' %} + {% set nova_compute_packages = nova_compute_packages + [ + 'python-rtslib-fb', + 'targetcli-fb' + ] %} + {% elif base_distro == 'ubuntu' %} + {% set nova_compute_packages = nova_compute_packages + [ + 'python-rtslib', + 'targetcli' + ] %} + {% endif %} + {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} RUN rm -f /etc/nova/nova-compute.conf @@ -74,11 +85,22 @@ RUN rm -f /etc/nova/nova-compute.conf 'libvirt-dev', 'nfs-common', 'open-iscsi', - 'python-rtslib', - 'qemu-utils', - 'targetcli' + 'qemu-utils' ] %} + # Debian/stretch uses rtslib-fb (like CentOS does) + {% if base_distro == 'debian' %} + {% set nova_compute_packages = nova_compute_packages + [ + 'python-rtslib-fb', + 'targetcli-fb' + ] %} + {% elif base_distro == 'ubuntu' %} + {% set nova_compute_packages = nova_compute_packages + [ + 'python-rtslib', + 'targetcli' + ] %} + {% endif %} + RUN mkdir -p /etc/ceph {% endif %} |