Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable line-length check. Fix found issues. #47

Merged
merged 3 commits into from Oct 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion molecule/default/yamllint.yml
Expand Up @@ -7,6 +7,5 @@ rules:
brackets:
max-spaces-inside: 1
level: error
line-length: disable
truthy: disable
document-start: disable
13 changes: 12 additions & 1 deletion tasks/main.yml
@@ -1,5 +1,14 @@
---

- name: Set version specific variables
include_vars: "{{ item }}"
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
- "default.yml"

- name: Check if only NTP is needed
set_fact:
timesync_mode: 1
Expand Down Expand Up @@ -27,7 +36,9 @@

- name: Select NTP provider
set_fact:
timesync_ntp_provider: "{{ timesync_ntp_provider_os_default if timesync_ntp_provider_current == '' else timesync_ntp_provider_current }}"
timesync_ntp_provider: "{{
timesync_ntp_provider_current|
default(timesync_ntp_provider_os_default, true) }}"
when:
- timesync_mode != 2
- timesync_ntp_provider == ''
Expand Down
1 change: 1 addition & 0 deletions vars/CentOS-6.yml
@@ -0,0 +1 @@
timesync_ntp_provider_os_default: "ntp"
1 change: 1 addition & 0 deletions vars/RedHat-6.yml
@@ -0,0 +1 @@
timesync_ntp_provider_os_default: "ntp"
1 change: 1 addition & 0 deletions vars/default.yml
@@ -0,0 +1 @@
timesync_ntp_provider_os_default: "chrony"
1 change: 0 additions & 1 deletion vars/main.yml

This file was deleted.