From b53f3b79832bfb19c7cb5592b5630c2f0bc6d572 Mon Sep 17 00:00:00 2001 From: Arun Kant Date: Thu, 29 Nov 2018 17:15:04 -0800 Subject: [PATCH] Updating binaries depenencies names for building suse images For leap 15, some of the package names are different so updating their names to reflect that. Verified these change when building openstack service images from openstack helm. Openstack helm uses profile which adds additional dependencies in images and may be that's why this issue (different package name) is not encountered in loci internal build process. Change-Id: Ic9dbdbe426f5d42c99a37bea0fc3137455bf5d5f --- bindep.txt | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/bindep.txt b/bindep.txt index 3247254..81dae11 100644 --- a/bindep.txt +++ b/bindep.txt @@ -14,7 +14,7 @@ ebtables [neutron] erlang-base-hipe [(infra rabbitmq hipe)] gcc [platform:rpm requirements] gcc-c++ [platform:rpm requirements] -genisoimage [(nova configdrive)] +genisoimage [!platform:suse (nova configdrive)] gettext [horizon] git [requirements] haproxy [neutron (infra haproxy)] @@ -59,6 +59,7 @@ libpcre3-dev [platform:dpkg requirements] libpq-dev [platform:dpkg requirements] libpython2.7 [platform:dpkg !python3] libpython3.5 [platform:dpkg python3] +librbd1 [platform:suse (glance ceph !python3)] librdkafka-dev [platform:dpkg requirements] libsasl2-dev [platform:dpkg requirements] libssl-dev [platform:dpkg requirements] @@ -80,9 +81,10 @@ lvm2 [(cinder lvm)] make [platform:rpm requirements] mariadb-devel [platform:rpm !platform:suse requirements] memcached [(infra memcached)] +mkisofs [platform:suse (nova configdrive)] mod_auth_mellon [platform:rpm (keystone apache mellon)] mod_auth_openidc [platform:rpm (keystone apache openidc)] -mod_ssl [platform:rpm apache] +mod_ssl [platform:rpm !platform:suse apache] mod_wsgi [platform:rpm apache] mozilla-nss-devel [platform:suse requirements] multipath-tools [platform:dpkg (cinder purestorage) (nova purestorage)] @@ -90,9 +92,11 @@ nginx [nginx] nss-devel [platform:rpm !platform:suse requirements] nss-util [platform:rpm !platform:suse requirements] open-iscsi [platform:dpkg (cinder purestorage) (nova purestorage)] -openldap [platform:rpm (keystone ldap !python3)] +openldap [platform:rpm !platform:suse (keystone ldap !python3)] openldap-devel [platform:rpm !platform:suse requirements] +openldap2 [platform:suse (keystone ldap !python3)] openldap2-devel [platform:suse requirements] +openssl [platform:suse apache] openssl-devel [platform:rpm !platform:suse requirements] openvswitch [platform:rpm (neutron openvswitch) (nova openvswitch) (infra openvswitch)] openvswitch-switch [platform:dpkg (neutron openvswitch) (nova openvswitch) (infra openvswitch)] @@ -102,20 +106,24 @@ pkgconfig [platform:rpm requirements] postgresql-devel [platform:rpm requirements] python-dev [platform:dpkg (requirements !python3)] python-devel [platform:rpm (requirements !python3)] -python-rbd [(glance ceph !python3)] +python-rbd [!platform:suse (glance ceph !python3)] python3-dev [platform:dpkg (requirements python3)] python3-devel [platform:rpm (requirements python3)] -python3-rbd [(glance ceph python3)] +python3-rados [platform:suse (glance ceph python3)] +python3-rbd [!platform:suse (glance ceph python3)] qemu [platform:dpkg (infra libvirt)] -qemu-img [platform:rpm (nova qemu) (ironic qemu) (cinder qemu)] +qemu-img [platform:rpm !platform:suse (nova qemu) (ironic qemu) (cinder qemu)] +qemu-tools [platform:suse (nova qemu) (ironic qemu) (cinder qemu)] qemu-utils [platform:dpkg (nova qemu) (ironic qemu) (cinder qemu)] rabbitmq-server [(infra rabbitmq)] sg3-utils [platform:dpkg (cinder purestorage) (nova purestorage)] sg3_utils [platform:rpm (cinder purestorage) (nova purestorage)] -syslinux-tftpboot [platform:rpm (ironic tftp)] +syslinux-tftpboot [platform:rpm !platform:suse (ironic tftp)] systemd-devel [platform:rpm requirements] targetcli [platform:rpm (cinder lvm)] -tftp-server [platform:rpm (ironic tftp)] +tftp [platform:suse (ironic tftp)] +tftp-server [platform:rpm !platform:suse (ironic tftp)] +tftpboot-installation-common [platform:suse (ironic tftp)] tftpd-hpa [platform:dpkg (ironic tftp)] tgt [platform:dpkg (cinder lvm)] thin-provisioning-tools [platform:dpkg (cinder lvm)]