Merge pull request openstack-k8s-operators#666 from bshephar/sshd-server-options

Use private variable for sshd_options

Author: openshift-merge-bot[bot]

roles/edpm_sshd/molecule/banners/converge.yml

@@ -21,3 +21,4 @@
     - name: osp.edpm.edpm_sshd
       edpm_sshd_motd_enabled: true
       edpm_sshd_banner_enabled: true
+      edpm_sshd_banner_text: "Test banner"

roles/edpm_sshd/molecule/banners/verify.yml

@@ -0,0 +1,12 @@
+---
+- name: Verify
+  hosts: all
+  tasks:
+    - name: Ensure banner is set correctly
+      ansible.builtin.lineinfile:
+        path: /etc/ssh/sshd_config
+        line: "Banner /etc/issue"
+        state: present
+      register: banner
+      failed_when:
+        - banner is changed

roles/edpm_sshd/tasks/configure.yml

@@ -68,7 +68,7 @@
 
     - name: Update sshd configuration options from vars
       ansible.builtin.set_fact:
-        edpm_sshd_server_options: |-
+        _edpm_sshd_server_options: |-
          {% set _ = edpm_sshd_server_options.__setitem__('PasswordAuthentication', edpm_sshd_password_authentication) %}
          {% if edpm_sshd_banner_enabled %}
          {% set _ = edpm_sshd_server_options.__setitem__('Banner', '/etc/issue') %}

roles/edpm_sshd/templates/sshd_config_block.j2

@@ -1,6 +1,6 @@
 ## {{ ansible_managed }}
 
-{% for k, v in edpm_sshd_server_options.items() %}
+{% for k, v in _edpm_sshd_server_options.items() %}
 {%   if (v is iterable) and (v is not string) %}
 {%     set vars = (v | unique) %}
 {%     for var in vars %}