Merge "install memcached for swift via files"

2012-11-15 13:06:21 +00:00
parent 7a51891cb4 c6d54c10df
commit 8205e0dcfb
3 changed files with 2 additions and 7 deletions
--- a/files/apts/swift
+++ b/files/apts/swift
@@ -1,6 +1,6 @@
 curl
 gcc
-memcached # NOPRIME
+memcached
 python-configobj
 python-coverage
 python-dev
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -1,6 +1,6 @@
 curl
 gcc
-memcached # NOPRIME
+memcached
 python-configobj
 python-coverage
 python-devel
--- a/stack.sh
+++ b/stack.sh
@@ -779,11 +779,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