Merge pull request #5 from TOoSmOotH/master

Redis and Filebeat fixes to point to IP
This commit is contained in:
Mike Reeves
2018-10-18 21:20:41 -04:00
committed by GitHub
3 changed files with 4 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
{%- set master = grains['master'] %}
{% set master = salt['pillar.get']('static:masterip', '') %}
input {
redis {
host => '{{ master }}'

View File

@@ -1,9 +1,9 @@
{%- if salt['grains.get']('role') == 'so-master' %}
{%- set master = salt['pillar.get']('master:mainip', '') -%}
{% set master = salt['pillar.get']('static:masterip', '') %}
{%- set nodetype = 'master' %}
{%- else %}
{%- set nodetype = salt['pillar.get']('node:node_type', 'storage') %}
{%- set master = grains['master'] %}
{% set master = salt['pillar.get']('static:masterip', '') %}
{%- endif %}
output {
redis {

View File

@@ -409,6 +409,7 @@ master_static() {
echo " proxy: $PROXY" >> /opt/so/saltstack/pillar/static.sls
echo " broversion: $BROVERSION" >> /opt/so/saltstack/pillar/static.sls
echo " ids: $NIDS" >> /opt/so/saltstack/pillar/static.sls
echo " masterip: $MAINIP" >> /opt/so/saltstack/pillar/static.sls
if [ $MASTERUPDATES == 'MASTER' ]; then
echo " masterupdate: 1" >> /opt/so/saltstack/pillar/static.sls
else