From 1dfef1130362b7c45c32f64fc7fe9b565743dd07 Mon Sep 17 00:00:00 2001 From: Konstantin Nikolaev Date: Wed, 14 Feb 2018 13:08:09 +0700 Subject: [PATCH] Support "salt://path_to_keyname" ssh_key definition in users."user name".ssh_keys."privkey|pubkey" pillar data --- users/init.sls | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/users/init.sls b/users/init.sls index 0206ba3..8297317 100644 --- a/users/init.sls +++ b/users/init.sls @@ -194,7 +194,12 @@ users_{{ name }}_{{ key_name }}_key: - mode: 600 {% endif %} - show_diff: False + {%- set key_value = salt['pillar.get']('users:'+name+':ssh_keys:'+_key) %} + {%- if 'salt://' in key_value[:7] %} + - source: {{ key_value }} + {%- else %} - contents_pillar: users:{{ name }}:ssh_keys:{{ _key }} + {%- endif %} - require: - user: users_{{ name }}_user {% for group in user.get('groups', []) %}