From 3d0e11147934a9b91762bcb9d37057ed50c5bbd2 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 21 Jul 2014 13:13:00 -0400 Subject: [PATCH] Use package-installs in fedora Updates the fedora element to use the declarative package install support provided by the package-installs element. Change-Id: Ib3eb1936aa5c4efc350828e004794b0a8bd6c6c4 --- .../fedora/install.d/00-fedora-fixup-audit | 9 --------- .../fedora/install.d/00-fedora-fixup-openssl | 10 ---------- elements/fedora/install.d/00-fedora-fixup-vim | 8 -------- ...fixup-pyopenssl => package-installs-fedora} | 18 ++++++++++++++---- 4 files changed, 14 insertions(+), 31 deletions(-) delete mode 100755 elements/fedora/install.d/00-fedora-fixup-audit delete mode 100755 elements/fedora/install.d/00-fedora-fixup-openssl delete mode 100755 elements/fedora/install.d/00-fedora-fixup-vim rename elements/fedora/install.d/{00-fedora-fixup-pyopenssl => package-installs-fedora} (51%) mode change 100755 => 100644 diff --git a/elements/fedora/install.d/00-fedora-fixup-audit b/elements/fedora/install.d/00-fedora-fixup-audit deleted file mode 100755 index 1a74d326..00000000 --- a/elements/fedora/install.d/00-fedora-fixup-audit +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -# 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 -exec install-packages audit diff --git a/elements/fedora/install.d/00-fedora-fixup-openssl b/elements/fedora/install.d/00-fedora-fixup-openssl deleted file mode 100755 index c52612ab..00000000 --- a/elements/fedora/install.d/00-fedora-fixup-openssl +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -# 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 -install-packages openssl diff --git a/elements/fedora/install.d/00-fedora-fixup-vim b/elements/fedora/install.d/00-fedora-fixup-vim deleted file mode 100755 index c27a5355..00000000 --- a/elements/fedora/install.d/00-fedora-fixup-vim +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -# Workaround for: -# https://bugzilla.redhat.com/show_bug.cgi?id=1066983 -install-packages vim-minimal diff --git a/elements/fedora/install.d/00-fedora-fixup-pyopenssl b/elements/fedora/install.d/package-installs-fedora old mode 100755 new mode 100644 similarity index 51% rename from elements/fedora/install.d/00-fedora-fixup-pyopenssl rename to elements/fedora/install.d/package-installs-fedora index 203b0154..afcc802b --- a/elements/fedora/install.d/00-fedora-fixup-pyopenssl +++ b/elements/fedora/install.d/package-installs-fedora @@ -1,7 +1,13 @@ -#!/bin/bash +# 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 -set -eu -set -o pipefail +# 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 @@ -11,4 +17,8 @@ set -o pipefail # 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 +python-pyopenssl + +# Workaround for: +# https://bugzilla.redhat.com/show_bug.cgi?id=1066983 +vim-minimal