97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
93 lines
3.2 KiB
Text
Executable file
93 lines
3.2 KiB
Text
Executable file
#!/usr/local/bin/dib-python
|
|
# dib-lint: disable=indent
|
|
# dib-lint indent requirements causes issue with pep8
|
|
|
|
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from __future__ import print_function
|
|
import sys
|
|
|
|
# Manually maintained for brevity; consider making this compiled from
|
|
# distromatch or other rich data sources.
|
|
# Debian name on the left, Fedora/RHEL on the right.
|
|
package_map = {
|
|
'apache2': 'httpd',
|
|
'arping': 'iputils',
|
|
'augeas-tools': 'augeas',
|
|
'build-essential': 'make automake gcc gcc-c++ kernel-devel',
|
|
'default-jre': 'java',
|
|
'extlinux': 'syslinux-extlinux',
|
|
'gearman-job-server': 'gearmand',
|
|
'grub-pc': 'grub2-tools grub2',
|
|
'libaio1': 'libaio',
|
|
'libapache2-mod-wsgi': 'mod_wsgi',
|
|
'libc6-dev': 'glibc-devel',
|
|
'libmariadb-dev': 'mariadb-devel',
|
|
'libffi-dev': 'libffi-devel',
|
|
'libldap2-dev': 'python-ldap',
|
|
'libmysql-dev': 'mysql++-devel',
|
|
'libmysql-java': 'mysql-connector-java',
|
|
'libmysqlclient-dev': 'mysql-devel',
|
|
'libpq-dev': 'libpqxx-devel',
|
|
'libxslt-dev': 'libxslt-devel',
|
|
'libsasl2-dev': 'cyrus-sasl-devel',
|
|
'libsqlite3-dev': 'libsqlite3x-devel',
|
|
'libssl-dev': 'openssl-devel',
|
|
'libvirt-bin': 'libvirt',
|
|
'libxml2-dev': 'libxml2-devel',
|
|
'libz-dev': 'zlib-devel',
|
|
'linux-headers-generic': 'kernel-headers',
|
|
'linux-image-generic': 'kernel',
|
|
'lm-sensors': 'lm_sensors',
|
|
'mysql-client-5.5': 'mariadb',
|
|
'mysql-server-5.5': 'mariadb-server',
|
|
'nagios-plugins-basic': 'nagios-plugins-all',
|
|
'nfs-common': 'nfs-utils',
|
|
'nfs-kernel-server': 'nfs-utils',
|
|
'open-iscsi': 'iscsi-initiator-utils',
|
|
'openjdk-7-jre-headless': 'java-1.7.0-openjdk-headless',
|
|
'openssh-client': 'openssh-clients',
|
|
'openvswitch-common': 'openvswitch',
|
|
'openvswitch-switch': 'openvswitch',
|
|
'python-dev': 'python-devel',
|
|
'python-libvirt': 'libvirt-python',
|
|
'python-memcache': 'python-memcached',
|
|
'python-mysqldb': 'MySQL-python',
|
|
'python-numpy': 'numpy',
|
|
'python-pyopenssl': 'pyOpenSSL',
|
|
'python-xattr': 'pyxattr',
|
|
'qemu-utils': 'qemu-img',
|
|
'qpid-client': 'qpid-cpp-client',
|
|
'qpidd': 'qpid-cpp-server',
|
|
'snmp-mibs-downloader': '',
|
|
'snmpd': 'net-snmp',
|
|
'stunnel4': 'stunnel',
|
|
'tftpd-hpa': 'tftp-server',
|
|
'tgt': 'scsi-target-utils',
|
|
'vlan': 'vconfig',
|
|
# openstack mappings
|
|
'openstack-neutron-dhcp-agent': 'openstack-neutron',
|
|
}
|
|
|
|
print("WARNING: map-packages is deprecated. Please use the pkg-map element.",
|
|
file=sys.stderr)
|
|
|
|
for arg in sys.argv[1:]:
|
|
if arg not in package_map and arg.endswith('-dev'):
|
|
# convert -dev into devel
|
|
print('%s%s' % (arg, 'el'))
|
|
else:
|
|
print(package_map.get(arg, arg))
|
|
sys.exit(0)
|