summaryrefslogtreecommitdiffstats
path: root/tests/test.yml
diff options
context:
space:
mode:
authorJeff Geerling <geerlingguy@mac.com>2016-03-03 22:49:30 -0600
committerJeff Geerling <geerlingguy@mac.com>2016-03-03 22:49:30 -0600
commit836d4144c3090636fa74bedd55842ba19bc7c1dc (patch)
tree103fd05671d52dfab54cb7c38d08a747bff057c6 /tests/test.yml
parent8997ed53da3dcfcb875e1eec6e38205394b04e3e (diff)
parent9c0a3ce4ff0c8bc00dbb8497193c2fc5f015c5aa (diff)
downloadntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.gz
ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.bz2
ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.tar.xz
ntp-836d4144c3090636fa74bedd55842ba19bc7c1dc.zip
Fixed merge conflicts.
Diffstat (limited to 'tests/test.yml')
-rw-r--r--tests/test.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/test.yml b/tests/test.yml
index 794470d..34c9773 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -4,6 +4,7 @@
vars:
ntp_enabled: false
+ ntp_manage_config: true
roles:
- ansible-role-ntp