From 0ce1f0da737af9d99d467a313631d5ffc4950782 Mon Sep 17 00:00:00 2001
From: Christian Boltz <opensuse@cboltz.de>
Date: Nov 21 2017 00:12:57 +0000
Subject: Adjust wikisearch role for the winning pull request


Also update FORMULAS.yaml to switch back to the upstream
elasticsearch-formula.

---

diff --git a/FORMULAS.yaml b/FORMULAS.yaml
index 781bb37..1392885 100644
--- a/FORMULAS.yaml
+++ b/FORMULAS.yaml
@@ -1,8 +1,5 @@
 ---
-elasticsearch:
-  namespace: 'cboltz'
-  pending:
-    - 'https://github.com/saltstack-formulas/elasticsearch-formula/pull/36'
+elasticsearch: {}
 grains:
   namespace: 'tampakrap'
 keepalived: {}
diff --git a/pillar/role/wikisearch.sls b/pillar/role/wikisearch.sls
index 74ffbef..891508a 100644
--- a/pillar/role/wikisearch.sls
+++ b/pillar/role/wikisearch.sls
@@ -7,7 +7,7 @@ apparmor:
       source: salt://profile/wikisearch/files/elasticsearch.apparmor
 
 elasticsearch:
-  add_repo: False
+  use_repo: False
   config:
     node.name: ${HOSTNAME}
     node.master: true