From 71d65f389e34f541e47ec77bc5bc308f1650f4b2 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Wed, 1 Oct 2014 17:38:41 -0500
Subject: [PATCH] Converted logstash to use repo_packages

---
 rpc_deployment/inventory/group_vars/logstash.yml  | 15 ---------------
 .../playbooks/infrastructure/logstash-install.yml | 11 +++--------
 rpc_deployment/vars/repo_packages/logstash.yml    |  4 ++++
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/rpc_deployment/inventory/group_vars/logstash.yml b/rpc_deployment/inventory/group_vars/logstash.yml
index b0b045131d..6686b32c9e 100644
--- a/rpc_deployment/inventory/group_vars/logstash.yml
+++ b/rpc_deployment/inventory/group_vars/logstash.yml
@@ -21,18 +21,3 @@ verbose: True
 
 container_lvm_fstype: ext4
 container_lvm_fssize: 5GB
-
-# Apt repos for ELK
-apt_container_keys:
-  - { url: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch", state: "present" }
-
-apt_container_repos:
-  - { repo: "deb http://packages.elasticsearch.org/logstash/1.4/debian stable main", state: "present"}
-
-container_packages:
-  - logstash
-  - logstash-contrib
-
-service_pip_dependencies:
-  - python-memcached
-  - pycrypto
diff --git a/rpc_deployment/playbooks/infrastructure/logstash-install.yml b/rpc_deployment/playbooks/infrastructure/logstash-install.yml
index 347b7792c8..d33ed25f5d 100644
--- a/rpc_deployment/playbooks/infrastructure/logstash-install.yml
+++ b/rpc_deployment/playbooks/infrastructure/logstash-install.yml
@@ -13,19 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Setup supporting services
 - hosts: logstash
   user: root
   roles:
     - container_extra_setup
-  vars_files:
-    - vars/config_vars/container_config_logstash.yml
-
-
-- hosts: logstash
-  user: root
-  roles:
     - common
     - container_common
     - logging_common
     - logstash
+  vars_files:
+    - vars/repo_packages/logstash.yml
+    - vars/config_vars/container_config_logstash.yml
diff --git a/rpc_deployment/vars/repo_packages/logstash.yml b/rpc_deployment/vars/repo_packages/logstash.yml
index 35ff3159d0..55eca37396 100644
--- a/rpc_deployment/vars/repo_packages/logstash.yml
+++ b/rpc_deployment/vars/repo_packages/logstash.yml
@@ -26,3 +26,7 @@ container_packages:
   - logstash
   - logstash-contrib
   - openjdk-7-jre
+
+service_pip_dependencies:
+  - python-memcached
+  - pycrypto