From 612910d6e91632e4e27027aa6ef884c4c8ee00ce Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Nov 21 2017 22:03:37 +0000
Subject: Revert "Merge branch 'cboltz-elasticsearch-workaround' into 'production'"


This reverts merge request !115
---

diff --git a/FORMULAS.yaml b/FORMULAS.yaml
index 8246106..1392885 100644
--- a/FORMULAS.yaml
+++ b/FORMULAS.yaml
@@ -1,7 +1,5 @@
 ---
-elasticsearch:
-  pending:
-    - 'https://github.com/saltstack-formulas/elasticsearch-formula/pull/48'
+elasticsearch: {}
 grains:
   namespace: 'tampakrap'
 keepalived: {}
diff --git a/pillar/role/wikisearch.sls b/pillar/role/wikisearch.sls
index d797b4f..891508a 100644
--- a/pillar/role/wikisearch.sls
+++ b/pillar/role/wikisearch.sls
@@ -7,9 +7,6 @@ apparmor:
       source: salt://profile/wikisearch/files/elasticsearch.apparmor
 
 elasticsearch:
-  # workaround until https://github.com/saltstack-formulas/elasticsearch-formula/pull/48 is accepted
-  lookup:
-    use_repo: False
   use_repo: False
   config:
     node.name: ${HOSTNAME}