Browse Source

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
Arun Kant 4 months ago
parent
commit
b53f3b7983
1 changed files with 16 additions and 8 deletions
  1. 16
    8
      bindep.txt

+ 16
- 8
bindep.txt View File

@@ -14,7 +14,7 @@ ebtables                    [neutron]
14 14
 erlang-base-hipe            [(infra rabbitmq hipe)]
15 15
 gcc                         [platform:rpm requirements]
16 16
 gcc-c++                     [platform:rpm requirements]
17
-genisoimage                 [(nova configdrive)]
17
+genisoimage                 [!platform:suse (nova configdrive)]
18 18
 gettext                     [horizon]
19 19
 git                         [requirements]
20 20
 haproxy                     [neutron (infra haproxy)]
@@ -59,6 +59,7 @@ libpcre3-dev                [platform:dpkg requirements]
59 59
 libpq-dev                   [platform:dpkg requirements]
60 60
 libpython2.7                [platform:dpkg !python3]
61 61
 libpython3.5                [platform:dpkg python3]
62
+librbd1                     [platform:suse (glance ceph !python3)]
62 63
 librdkafka-dev              [platform:dpkg requirements]
63 64
 libsasl2-dev                [platform:dpkg requirements]
64 65
 libssl-dev                  [platform:dpkg requirements]
@@ -80,9 +81,10 @@ lvm2                        [(cinder lvm)]
80 81
 make                        [platform:rpm requirements]
81 82
 mariadb-devel               [platform:rpm !platform:suse requirements]
82 83
 memcached                   [(infra memcached)]
84
+mkisofs                     [platform:suse (nova configdrive)]
83 85
 mod_auth_mellon             [platform:rpm (keystone apache mellon)]
84 86
 mod_auth_openidc            [platform:rpm (keystone apache openidc)]
85
-mod_ssl                     [platform:rpm apache]
87
+mod_ssl                     [platform:rpm !platform:suse apache]
86 88
 mod_wsgi                    [platform:rpm apache]
87 89
 mozilla-nss-devel           [platform:suse requirements]
88 90
 multipath-tools             [platform:dpkg (cinder purestorage) (nova purestorage)]
@@ -90,9 +92,11 @@ nginx                       [nginx]
90 92
 nss-devel                   [platform:rpm !platform:suse requirements]
91 93
 nss-util                    [platform:rpm !platform:suse requirements]
92 94
 open-iscsi                  [platform:dpkg (cinder purestorage) (nova purestorage)]
93
-openldap                    [platform:rpm (keystone ldap !python3)]
95
+openldap                    [platform:rpm !platform:suse (keystone ldap !python3)]
94 96
 openldap-devel              [platform:rpm !platform:suse requirements]
97
+openldap2                   [platform:suse (keystone ldap !python3)]
95 98
 openldap2-devel             [platform:suse requirements]
99
+openssl                     [platform:suse apache]
96 100
 openssl-devel               [platform:rpm !platform:suse requirements]
97 101
 openvswitch                 [platform:rpm (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
98 102
 openvswitch-switch          [platform:dpkg (neutron openvswitch) (nova openvswitch) (infra openvswitch)]
@@ -102,20 +106,24 @@ pkgconfig                   [platform:rpm requirements]
102 106
 postgresql-devel            [platform:rpm requirements]
103 107
 python-dev                  [platform:dpkg (requirements !python3)]
104 108
 python-devel                [platform:rpm (requirements !python3)]
105
-python-rbd                  [(glance ceph !python3)]
109
+python-rbd                  [!platform:suse (glance ceph !python3)]
106 110
 python3-dev                 [platform:dpkg (requirements python3)]
107 111
 python3-devel               [platform:rpm (requirements python3)]
108
-python3-rbd                 [(glance ceph python3)]
112
+python3-rados               [platform:suse (glance ceph python3)]
113
+python3-rbd                 [!platform:suse (glance ceph python3)]
109 114
 qemu                        [platform:dpkg (infra libvirt)]
110
-qemu-img                    [platform:rpm (nova qemu) (ironic qemu) (cinder qemu)]
115
+qemu-img                    [platform:rpm !platform:suse (nova qemu) (ironic qemu) (cinder qemu)]
116
+qemu-tools                  [platform:suse (nova qemu) (ironic qemu) (cinder qemu)]
111 117
 qemu-utils                  [platform:dpkg (nova qemu) (ironic qemu) (cinder qemu)]
112 118
 rabbitmq-server             [(infra rabbitmq)]
113 119
 sg3-utils                   [platform:dpkg (cinder purestorage) (nova purestorage)]
114 120
 sg3_utils                   [platform:rpm (cinder purestorage) (nova purestorage)]
115
-syslinux-tftpboot           [platform:rpm (ironic tftp)]
121
+syslinux-tftpboot           [platform:rpm !platform:suse (ironic tftp)]
116 122
 systemd-devel               [platform:rpm requirements]
117 123
 targetcli                   [platform:rpm (cinder lvm)]
118
-tftp-server                 [platform:rpm (ironic tftp)]
124
+tftp                        [platform:suse (ironic tftp)]
125
+tftp-server                 [platform:rpm !platform:suse (ironic tftp)]
126
+tftpboot-installation-common [platform:suse (ironic tftp)]
119 127
 tftpd-hpa                   [platform:dpkg (ironic tftp)]
120 128
 tgt                         [platform:dpkg (cinder lvm)]
121 129
 thin-provisioning-tools     [platform:dpkg (cinder lvm)]

Loading…
Cancel
Save