From c1e3615d9e13e039a4f4f20606c76bff73a663e4 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 31 Oct 2019 10:49:11 -0400 Subject: [PATCH] change the mine target to master's minion id instead of it's hostname - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/96 --- salt/ssl/init.sls | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index a4aaba02a..b78e5f578 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -1,12 +1,13 @@ {% set master = salt['grains.get']('master') %} +{% set master_minion_id = master.split(".")[0] %} {%- set masterip = salt['pillar.get']('static:masterip', '') -%} {% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %} {% set trusttheca_text = salt['mine.get'](grains.id, 'x509.get_pem_entries')[grains.id]['/etc/pki/ca.crt']|replace('\n', '') %} {% set ca_server = grains.id %} {% else %} - {% set trusttheca_text = salt['mine.get'](master, 'x509.get_pem_entries')[master]['/etc/pki/ca.crt']|replace('\n', '') %} - {% set ca_server = master %} + {% set trusttheca_text = salt['mine.get'](master_minion_id, 'x509.get_pem_entries')[master_minion_id]['/etc/pki/ca.crt']|replace('\n', '') %} + {% set ca_server = master_minion_id %} {% endif %} # Trust the CA