ansible 2.0 fixes

Author: Marc Aschmann

defaults/main.yml

@@ -1,31 +1,31 @@
 ---
 # necessary project vars
 
-#symfony_project_root: ''
-#symfony_project_composer_path: ''
-#symfony_project_repo: ''
-#symfony_project_env: ''
+#symfony_project_root: ""
+#symfony_project_composer_path: ""
+#symfony_project_repo: ""
+#symfony_project_env: ""
 
 # hooks
-symfony_project_post_folder_creation_tasks: ~
-symfony_project_pre_cache_warmup_tasks: ~
-symfony_project_pre_live_switch_tasks: ~
-symfony_project_post_live_switch_tasks: ~
+symfony_project_post_folder_creation_tasks: "{{role_path}}/tasks/empty.yml"
+symfony_project_pre_cache_warmup_tasks: "{{role_path}}/tasks/empty.yml"
+symfony_project_pre_live_switch_tasks: "{{role_path}}/tasks/empty.yml"
+symfony_project_post_live_switch_tasks: "{{role_path}}/tasks/empty.yml"
 
 symfony_project_release: ~
 symfony_project_branch: master
 symfony_project_php_path: php
 symfony_project_keep_releases: 5
 symfony_project_git_clone_depth: 1
 symfony_project_github_token: ~
-symfony_project_console_opts: ''
-symfony_project_console_command: 'app/console'
-symfony_project_config_dir: 'app/config'
+symfony_project_console_opts: ""
+symfony_project_console_command: "app/console"
+symfony_project_config_dir: "app/config"
 symfony_project_parameters_file: parameters.yml
 symfony_project_cache_command: cache:warmup
 
 symfony_project_manage_composer: True
-symfony_project_composer_opts: '--no-dev --optimize-autoloader --no-interaction'
+symfony_project_composer_opts: "--no-dev --optimize-autoloader --no-interaction"
 symfony_project_composer_run_install: True
 
 symfony_project_enable_cache_warmup: True

tasks/main.yml

@@ -27,7 +27,7 @@
   shell: cat {{symfony_current_release_dir}}/composer.json
   register: composer_content
 
-- include: "{{symfony_project_post_folder_creation_tasks | default('empty.yml')}}"
+- include: "{{symfony_project_post_folder_creation_tasks}}"
 
 - name: Create symlinks to shared directories.
   file: state=link src="{{symfony_shared_dir}}/{{item.src}}" path="{{symfony_current_release_dir}}/{{item.path}}"
@@ -37,7 +37,7 @@
 
 - include: 20-composer.yml
 
-- include: "{{symfony_project_pre_cache_warmup_tasks | default('empty.yml')}}"
+- include: "{{symfony_project_pre_cache_warmup_tasks}}"
 
 - include: 30-cache.yml
 
@@ -48,11 +48,11 @@
 - name: Create release file.
   copy: content="{{symfony_current_release}}" dest="{{symfony_current_release_dir}}/RELEASE" mode=644
 
-- include: "{{symfony_project_pre_live_switch_tasks | default('empty.yml')}}"
+- include: "{{symfony_project_pre_live_switch_tasks}}"
 
 - name: Create symlink for release.
   file: state=link src="{{symfony_current_release_dir}}" path="{{symfony_project_root}}/current"
 
-- include: "{{symfony_project_post_live_switch_tasks | default('empty.yml')}}"
+- include: "{{symfony_project_post_live_switch_tasks}}"
 
 - include: 60-clean_releases.yml