diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 8f74aef..df46215 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -9,7 +9,7 @@ pre_tasks: - name: Update apt cache. apt: update_cache=yes cache_valid_time=600 - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' changed_when: false - name: Install dependencies (RedHat). @@ -18,11 +18,11 @@ - cronie - epel-release state: present - when: ansible_os_family == 'RedHat' + when: ansible_facts.os_family == 'RedHat' - name: Install cron (Debian). apt: name=cron state=present - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' roles: - geerlingguy.certbot diff --git a/molecule/default/playbook-snap-install.yml b/molecule/default/playbook-snap-install.yml index 572f1b5..e869670 100644 --- a/molecule/default/playbook-snap-install.yml +++ b/molecule/default/playbook-snap-install.yml @@ -10,16 +10,16 @@ pre_tasks: - name: Update apt cache. apt: update_cache=yes cache_valid_time=600 - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' changed_when: false - name: Install cron (RedHat). yum: name=cronie state=present - when: ansible_os_family == 'RedHat' + when: ansible_facts.os_family == 'RedHat' - name: Install cron (Debian). apt: name=cron state=present - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' roles: - geerlingguy.git diff --git a/molecule/default/playbook-source-install.yml b/molecule/default/playbook-source-install.yml index 28da1f3..f71d03b 100644 --- a/molecule/default/playbook-source-install.yml +++ b/molecule/default/playbook-source-install.yml @@ -10,16 +10,16 @@ pre_tasks: - name: Update apt cache. apt: update_cache=yes cache_valid_time=600 - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' changed_when: false - name: Install cron (RedHat). yum: name=cronie state=present - when: ansible_os_family == 'RedHat' + when: ansible_facts.os_family == 'RedHat' - name: Install cron (Debian). apt: name=cron state=present - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' roles: - geerlingguy.git diff --git a/molecule/default/playbook-standalone-nginx-aws.yml b/molecule/default/playbook-standalone-nginx-aws.yml index a5c53e5..9d6e8f1 100644 --- a/molecule/default/playbook-standalone-nginx-aws.yml +++ b/molecule/default/playbook-standalone-nginx-aws.yml @@ -111,19 +111,19 @@ pre_tasks: - name: Update apt cache. apt: update_cache=true cache_valid_time=600 - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' changed_when: false - name: Install dependencies (RedHat). yum: name={{ item }} state=present - when: ansible_os_family == 'RedHat' + when: ansible_facts.os_family == 'RedHat' with_items: - cronie - epel-release - name: Install cron (Debian). apt: name=cron state=present - when: ansible_os_family == 'Debian' + when: ansible_facts.os_family == 'Debian' roles: - geerlingguy.certbot diff --git a/tasks/include-vars.yml b/tasks/include-vars.yml index 0a70e50..9faa496 100644 --- a/tasks/include-vars.yml +++ b/tasks/include-vars.yml @@ -2,7 +2,7 @@ - name: Load a variable file based on the OS type, or a default if not found. include_vars: "{{ item }}" with_first_found: - - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml" - - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}.yml" + - "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_version }}.yml" + - "{{ ansible_facts.distribution }}.yml" + - "{{ ansible_facts.os_family }}.yml" - "default.yml" diff --git a/tasks/install-with-snap.yml b/tasks/install-with-snap.yml index 7a0ca65..d10c146 100644 --- a/tasks/install-with-snap.yml +++ b/tasks/install-with-snap.yml @@ -16,7 +16,7 @@ src: /var/lib/snapd/snap dest: /snap state: link - when: ansible_os_family != "Debian" + when: ansible_facts.os_family != "Debian" - name: Update snap after install. shell: snap install core; snap refresh core diff --git a/tasks/main.yml b/tasks/main.yml index 894143c..7723212 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,7 @@ - import_tasks: include-vars.yml - import_tasks: setup-RedHat.yml - when: ansible_os_family == 'RedHat' + when: ansible_facts.os_family == 'RedHat' - import_tasks: install-with-package.yml when: certbot_install_method == 'package' diff --git a/templates/start_services.j2 b/templates/start_services.j2 index ff1a21d..c40c7fe 100644 --- a/templates/start_services.j2 +++ b/templates/start_services.j2 @@ -3,11 +3,11 @@ {% for item in certbot_create_standalone_stop_services %} echo "starting service {{ item }}" -{% if ansible_service_mgr == 'systemd' %} +{% if ansible_facts.service_mgr == 'systemd' %} systemctl start {{ item }} -{% elif ansible_service_mgr == 'upstart' %} +{% elif ansible_facts.service_mgr == 'upstart' %} initctl start {{ item }} -{% elif ansible_service_mgr == 'openrc' %} +{% elif ansible_facts.service_mgr == 'openrc' %} rc-service {{ item }} start {% else %} service {{ item }} start diff --git a/templates/stop_services.j2 b/templates/stop_services.j2 index f087768..a36367b 100644 --- a/templates/stop_services.j2 +++ b/templates/stop_services.j2 @@ -3,11 +3,11 @@ {% for item in certbot_create_standalone_stop_services %} echo "stopping service {{ item }}" -{% if ansible_service_mgr == 'systemd' %} +{% if ansible_facts.service_mgr == 'systemd' %} systemctl stop {{ item }} -{% elif ansible_service_mgr == 'upstart' %} +{% elif ansible_facts.service_mgr == 'upstart' %} initctl stop {{ item }} -{% elif ansible_service_mgr == 'openrc' %} +{% elif ansible_facts.service_mgr == 'openrc' %} rc-service {{ item }} stop {% else %} service {{ item }} stop