Fix key-add call, for not-enabled user by default
Change-Id: Ied37c40263134466dbaeab6fc61113f748e05b49
Prod-related: PROD-29155 (PROD:29155)
diff --git a/openssh/client/private_key.sls b/openssh/client/private_key.sls
index a5639cc..d383e90 100644
--- a/openssh/client/private_key.sls
+++ b/openssh/client/private_key.sls
@@ -4,9 +4,17 @@
include:
- openssh.client.service
-{%- for xxx, user in client.get('user', {}).iteritems() %}
+ {%- for xxx, user in client.get('user', {}).iteritems() %}
+ {%- if user.private_key is defined %}
-{%- if user.private_key is defined %}
+
+{{ user.user.home }}/.ssh_dir_for_key:
+ file.directory:
+ - names:
+ - {{ user.user.home }}/.ssh
+ - user: {{ user.user.name }}
+ - mode: 700
+ - makedirs: true
{{ user.user.home }}/.ssh/id_{{ user.private_key.type }}:
file.managed:
@@ -16,10 +24,10 @@
- template: jinja
- defaults:
user_name: {{ user.user.name }}
- - require:
- - file: {{ user.user.home }}/.ssh
+ - require:
+ - file: {{ user.user.home }}/.ssh_dir_for_key
-{%- if user.public_key is defined %}
+ {%- if user.public_key is defined %}
{{ user.user.home }}/.ssh/id_{{ user.private_key.type }}.pub:
file.managed:
- user: {{ user.user.name }}
@@ -28,12 +36,9 @@
- template: jinja
- defaults:
user_name: {{ user.user.name }}
- - require:
- - file: {{ user.user.home }}/.ssh
-{%- endif %}
-
-{%- endif %}
-
-{%- endfor %}
-
+ - require:
+ - file: {{ user.user.home }}/.ssh_dir_for_key
+ {%- endif %}
+ {%- endif %}
+ {%- endfor %}
{%- endif %}