From e0ccce422bd5afa91244d0dd186744ae44ba3d13 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Nov 21 2017 21:19:55 +0000 Subject: add workaround for wrong pillar lookup in elasticsearch-formula elasticsearch-formula expects elasticsearch:lookup:use_repo instead of the documented elasticsearch:use_repo, see see https://github.com/saltstack-formulas/elasticsearch-formula/pull/48 Add the "wrong" version to ensure everything works as expected (and keep the "right" one to be sure we don't break anything when the fix gets accepted in the formula ;-) --- 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}