sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix pyOpenSSL on Fedora."

Browse Source
This commit is contained in:
Jenkins 2013-06-26 04:25:34 +00:00 committed by Gerrit Code Review
commit 2ced195d20
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/fedora/bin/map-packages
View File

@ -42,6 +42,7 @@ package_map = {
'libssl-dev': 'openssl-devel', 'libssl-dev': 'openssl-devel',
'libz-dev': 'zlib-devel', 'libz-dev': 'zlib-devel',
'qemu-utils': 'qemu-img', 'qemu-utils': 'qemu-img',
'python-pyopenssl': 'pyOpenSSL',
} }
for arg in sys.argv[1:]: for arg in sys.argv[1:]:

11
elements/fedora/install.d/00-fedora-fixup-pyopenssl Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
# 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.
install-packages python-pyopenssl