Merge branch 'dev' into feature/issue124

This commit is contained in:
Mike Reeves
2020-01-21 16:48:26 -05:00
committed by GitHub
58 changed files with 5157 additions and 2937 deletions

View File

@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{% set VERSION = salt['pillar.get']('static:soversion', '1.1.4') %}
{% set MASTER = salt['grains.get']('master') %}
# Logstash Section - Decide which pillar to use
{% if grains['role'] == 'so-sensor' %}