Merge pull request #78 from D4N/master

Fix for ansible_virtualization_type not being defined in Ansible > 2.5
This commit is contained in:
Matt Willsher 2018-04-24 11:25:13 +01:00 committed by GitHub
commit c7483f1294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -3,5 +3,5 @@
service: service:
name: "{{ sshd_service }}" name: "{{ sshd_service }}"
state: reloaded state: reloaded
when: sshd_allow_reload and ansible_virtualization_type != 'docker' when: "sshd_allow_reload and ansible_virtualization_type|default(None) != 'docker'"
listen: reload_sshd listen: reload_sshd

View file

@ -33,7 +33,7 @@
name: "{{ sshd_service }}" name: "{{ sshd_service }}"
enabled: true enabled: true
state: started state: started
when: sshd_manage_service and ansible_virtualization_type != 'docker' when: "sshd_manage_service and ansible_virtualization_type|default(None) != 'docker'"
- name: Register that this role has run - name: Register that this role has run
set_fact: sshd_has_run=true set_fact: sshd_has_run=true