From c6d54c10dff89c515e567b49247c7f13eaf4c2e8 Mon Sep 17 00:00:00 2001
From: Sean Dague <sdague@linux.vnet.ibm.com>
Date: Tue, 13 Nov 2012 15:08:26 -0500
Subject: [PATCH] install memcached for swift via files

when swift was enabled we were installing memcached via
stack.sh, after marking it optional in files. Just use
files instead.

Change-Id: Ib8ee2d1f47254e805f4747b8aff6e89baa66913c
---
 files/apts/swift | 2 +-
 files/rpms/swift | 2 +-
 stack.sh         | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/files/apts/swift b/files/apts/swift
index f29837784e..c52c68b765 100644
--- a/files/apts/swift
+++ b/files/apts/swift
@@ -1,6 +1,6 @@
 curl
 gcc
-memcached # NOPRIME
+memcached
 python-configobj
 python-coverage
 python-dev
diff --git a/files/rpms/swift b/files/rpms/swift
index c9d49e9257..ce41ceb8e2 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -1,6 +1,6 @@
 curl
 gcc
-memcached # NOPRIME
+memcached
 python-configobj
 python-coverage
 python-devel
diff --git a/stack.sh b/stack.sh
index 084f276d0c..8947382d9f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -784,11 +784,6 @@ if is_service_enabled q-agt; then
     fi
 fi
 
-if is_service_enabled swift; then
-    # Install memcached for swift.
-    install_package memcached
-fi
-
 TRACK_DEPENDS=${TRACK_DEPENDS:-False}
 
 # Install python packages into a virtualenv so that we can track them