Merge branch 'master' into tags

2017-05-31 15:24:45 -05:00 · 2017-05-31 15:24:45 -05:00 · a26e0c874b
commit a26e0c874b
parent 26bab2aae1 b1b0573f30
2 changed files with 9 additions and 0 deletions
--- a/default.config.yml
+++ b/default.config.yml
@ -74,3 +74,6 @@ mas_email: ""
 mas_password: ""

 osx_script: "~/.osx --no-restart"
+
+# Glob pattern to ansible task files to run after all other tasks are finished.
+post_provision_tasks: []
--- a/main.yml
+++ b/main.yml
@ -32,3 +32,9 @@
    - include: tasks/osx.yml
      when: configure_osx
      tags: ['osx']
+
+    - name: Run configured post-provision ansible task files.
+      include: "{{ outer_item }}"
+      loop_control:
+        loop_var: outer_item
+      with_fileglob: "{{ post_provision_tasks|default(omit) }}"