From f2885fe3c08be7f49db0513b738ec8193d366ea4 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Nov 21 2017 21:27:48 +0000
Subject: Merge branch 'cboltz-elasticsearch-workaround' into 'production'


add workaround for wrong pillar lookup in elasticsearch-formula

See merge request infra/salt!115
---

diff --git a/FORMULAS.yaml b/FORMULAS.yaml
index 1392885..8246106 100644
--- a/FORMULAS.yaml
+++ b/FORMULAS.yaml
@@ -1,5 +1,7 @@
 ---
-elasticsearch: {}
+elasticsearch:
+  pending:
+    - 'https://github.com/saltstack-formulas/elasticsearch-formula/pull/48'
 grains:
   namespace: 'tampakrap'
 keepalived: {}
diff --git a/pillar/role/wikisearch.sls b/pillar/role/wikisearch.sls
index 891508a..d797b4f 100644
--- a/pillar/role/wikisearch.sls
+++ b/pillar/role/wikisearch.sls
@@ -7,6 +7,9 @@ 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}