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
35 lines
1.4 KiB
YAML
35 lines
1.4 KiB
YAML
# On a fresh Fedora 18 install you might have to update audit in order to
|
|
# fix a conflict with a file from the glibc package.
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=894307
|
|
audit:
|
|
|
|
# The version of openssl shipped in the fedora cloud image is no longer
|
|
# compatible with new python environments installed by virtualenv, so we need
|
|
# to update it first.
|
|
# See https://bugs.launchpad.net/diskimage-builder/+bug/1254879
|
|
openssl:
|
|
|
|
# FIXME: To avoid conflict between the pyOpenSSL installed via python-pip
|
|
# and pyOpenSSL installed via yum, we are going to sort it out installing
|
|
# it earlier at the beginning of the image building process. Pyhton-pip
|
|
# is installing pyOpenSSL as part of satisfying the requirements.txt
|
|
# in python-glanceclient and afterwards yum tries to install it as a
|
|
# dependency of the python-paste package needed for the heat element,
|
|
# this seems to be conflicting and causing the image building process to
|
|
# fail. The problem is hapenning on a Fedora 18 system.
|
|
python-pyopenssl:
|
|
|
|
# Workaround for:
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1066983
|
|
vim-minimal:
|
|
|
|
# kernel modules to match the core kernel
|
|
# Newer Fedora 21 splits these out into a separate package.
|
|
# It contains iscsi_tcp.ko (for Ironic) among other things like network
|
|
# driver modules, etc.
|
|
kernel-modules:
|
|
|
|
# This small package is required on Fedora 21 in order to build some
|
|
# packages via source (MySQL driver).
|
|
redhat-rpm-config:
|