Remove workaround for python-swiftclient

2014-10-27 11:43:47 -04:00 · 2014-10-27 11:43:47 -04:00 · bb4f4b15d1
parent 1d936f4075
commit bb4f4b15d1
3 changed files with 0 additions and 10 deletions
--- a/elements/python-swiftclient-python-futures/install.d/50-python-swiftclient-python-futures
+++ b/elements/python-swiftclient-python-futures/install.d/50-python-swiftclient-python-futures
@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eux
-set -o pipefail
-
-# python-swiftclient requires python-futures
-# https://bugzilla.redhat.com/show_bug.cgi?id=1154169
-yum -y install python-futures
--- a/json-files/fedora-20-undercloud-packages.json
+++ b/json-files/fedora-20-undercloud-packages.json
@ -45,7 +45,6 @@
      "element-manifest",
      "tuskar",
      "fix-undercloud-package-installs",
-      "python-swiftclient-python-futures",
      "os-cloud-config"
    ],
    "hook": [
--- a/scripts/instack-build-images
+++ b/scripts/instack-build-images
@ -66,7 +66,6 @@ stackuser \
 swift-proxy \
 swift-storage \
 use-ephemeral \
-python-swiftclient-python-futures \
 "}

 export OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS=${OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS:-"\