From eebe0eb618d8c1228c0fd7c169b30e74d3f8876c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 18 May 2020 10:54:07 -0400 Subject: [PATCH] get the first ip for the ip_interfaces:mainint grain --- salt/strelka/files/backend/backend.yaml | 2 +- salt/strelka/files/filestream/filestream.yaml | 2 +- salt/strelka/files/frontend/frontend.yaml | 2 +- salt/strelka/files/manager/manager.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/strelka/files/backend/backend.yaml b/salt/strelka/files/backend/backend.yaml index 0333afb18..76a2ae3af 100644 --- a/salt/strelka/files/backend/backend.yaml +++ b/salt/strelka/files/backend/backend.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%} diff --git a/salt/strelka/files/filestream/filestream.yaml b/salt/strelka/files/filestream/filestream.yaml index 34ec48052..c45fd8644 100644 --- a/salt/strelka/files/filestream/filestream.yaml +++ b/salt/strelka/files/filestream/filestream.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%} diff --git a/salt/strelka/files/frontend/frontend.yaml b/salt/strelka/files/frontend/frontend.yaml index 0e02b708e..56df323f9 100644 --- a/salt/strelka/files/frontend/frontend.yaml +++ b/salt/strelka/files/frontend/frontend.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%} diff --git a/salt/strelka/files/manager/manager.yaml b/salt/strelka/files/manager/manager.yaml index 17351e8a7..8a5966ac9 100644 --- a/salt/strelka/files/manager/manager.yaml +++ b/salt/strelka/files/manager/manager.yaml @@ -1,6 +1,6 @@ {%- if grains.role == 'so-sensor' -%} {%- set mainint = salt['pillar.get']('sensor:mainint') %} - {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint, salt['pillar.get']('sensor:mainip')) %} + {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint[0], salt['pillar.get']('sensor:mainip')) %} {%- else %} {%- set ip = salt['pillar.get']('static:masterip') %} {%- endif -%}