Merge pull request #95 from AaltoScienceIT/chroot

Make role work with chroot connections on EL 7.
willshersystems · Sep 22, 2018 · 6f43191 · 6f43191
2 parents 5d6262a + d438f09
commit 6f43191
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -3,5 +3,8 @@
   service:
     name: "{{ sshd_service }}"
     state: reloaded
-  when: "sshd_allow_reload and ansible_virtualization_type|default(None) != 'docker'"
+  when:
+    - sshd_allow_reload
+    - ansible_virtualization_type|default(None) != 'docker'
+    - ansible_connection != 'chroot'
   listen: reload_sshd
diff --git a/tasks/install.yml b/tasks/install.yml
@@ -41,7 +41,18 @@
     name: "{{ sshd_service }}"
     enabled: true
     state: started
-  when: "sshd_manage_service and ansible_virtualization_type|default(None) != 'docker'"
+  when:
+    - sshd_manage_service
+    - ansible_virtualization_type|default(None) != 'docker'
+    - ansible_connection != 'chroot'
+
+# Due to ansible bug 21026, cannot use service module on RHEL 7
+- name: Enable service in chroot
+  command: systemctl enable {{ sshd_service }}
+  when:
+    - ansible_connection == 'chroot'
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version|int >= 7
 
 - name: Register that this role has run
   set_fact: sshd_has_run=true