From b54779cff9892bf21220c33bf1211c6b8536436a Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Wed, 1 Oct 2014 22:02:19 -0500
Subject: [PATCH] converted memcached to use repo_packages

---
 .../inventory/group_vars/memcached.yml        |  4 ----
 .../infrastructure/memcached-install.yml      |  1 +
 rpc_deployment/roles/memcached/tasks/main.yml | 19 ++++++-------------
 .../vars/repo_packages/memcached.yml          |  4 ++++
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/rpc_deployment/inventory/group_vars/memcached.yml b/rpc_deployment/inventory/group_vars/memcached.yml
index c2d0fc149a..7b165df92f 100644
--- a/rpc_deployment/inventory/group_vars/memcached.yml
+++ b/rpc_deployment/inventory/group_vars/memcached.yml
@@ -18,7 +18,3 @@ service_name: memcached
 # only used when the lxc vg is present on the target
 container_lvm_fstype: ext4
 container_lvm_fssize: 5GB
-
-service_pip_dependencies:
-  - python-memcached
-  - pycrypto
diff --git a/rpc_deployment/playbooks/infrastructure/memcached-install.yml b/rpc_deployment/playbooks/infrastructure/memcached-install.yml
index d80ece9e8d..adef0b3e8b 100644
--- a/rpc_deployment/playbooks/infrastructure/memcached-install.yml
+++ b/rpc_deployment/playbooks/infrastructure/memcached-install.yml
@@ -22,3 +22,4 @@
     - memcached
   vars_files:
     - vars/config_vars/container_config_memcached.yml
+    - vars/repo_packages/memcached.yml
diff --git a/rpc_deployment/roles/memcached/tasks/main.yml b/rpc_deployment/roles/memcached/tasks/main.yml
index da94acbe71..d32aedd99a 100644
--- a/rpc_deployment/roles/memcached/tasks/main.yml
+++ b/rpc_deployment/roles/memcached/tasks/main.yml
@@ -13,18 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Install memcached
-  apt:
-    pkg: memcached
-    state: latest
-    update_cache: yes
-    cache_valid_time: 600
-
 - name: Drop memcached config
-  template: >
-    src="memcached.conf"
-    dest="/etc/memcached.conf"
-    owner=root
-    group=root 
-    mode=0644
+  template:
+    src: "memcached.conf"
+    dest: "/etc/memcached.conf"
+    owner: "root"
+    group: "root"
+    mode: "0644"
   notify: Restart memcached
diff --git a/rpc_deployment/vars/repo_packages/memcached.yml b/rpc_deployment/vars/repo_packages/memcached.yml
index 1a7fa58b07..3c129e25ef 100644
--- a/rpc_deployment/vars/repo_packages/memcached.yml
+++ b/rpc_deployment/vars/repo_packages/memcached.yml
@@ -17,3 +17,7 @@ repo_package_name: memcached
 
 container_packages:
   - memcached
+
+service_pip_dependencies:
+  - python-memcached
+  - pycrypto