Merge branch 'ansible-2.2.2.0' into 'master'

[TASK] Upgrade rsync syntax for ansible 2.2

See merge request !6

CHANGELOG

@@ -4,6 +4,12 @@ CHANGELOG
 3.1-dev
 -------
 
+  -
+
+3.1.2
+-----
+
+  - [TASK] Update to support ansible 2.2
   - [BUGFIX] Fix syncontent error with Neos3 on Read remote database info
 
 3.1.1

README.md

@@ -9,7 +9,7 @@ This is requires that your Flow Framework / Neos CMS installation is configured
 (see https://github.com/Sebobo/Shel.DockerFlow) or your TYPO3 installation is configured to run with `dockertypo3`
 package (see https://github.com/visay/DockerTYPO3) and all containers are started before executing the sync.
 
-Ansible is needed on your local machine.
+Ansible is needed on your local machine (support from 1.9 up to 2.2).
 
 ## Installation
 

ansible/roles/database/tasks/flow_db_dump.yml

@@ -36,4 +36,4 @@
 
   - name: Search and replace content in database dump
     local_action: replace dest="/tmp/{{ ssh_user }}/db_dump.sql" regexp="{{ item.value.search }}" replace="{{ item.value.replace }}"
-    with_dict: replacement | default({})
+    with_dict: "{{ replacement | default({}) }}"

ansible/roles/database/tasks/typo3.yml

@@ -7,7 +7,7 @@
 
   - name: Search and replace content in database dump
     local_action: replace dest="/tmp/{{ ssh_user }}/db_dump.sql" regexp="{{ item.value.search }}" replace="{{ item.value.replace }}"
-    with_dict: replacement | default({})
+    with_dict: "{{ replacement | default({}) }}"
     when: not from_cache|bool
 
   - name: Drop local database

ansible/roles/rsync/tasks/flow.yml

@@ -2,8 +2,10 @@
 # tasks file for rsync
 
   - name: Make sure local temp directory exists
-    local_action: file path="/tmp/{{ ssh_user }}/{{ item }}" state=directory
-    with_items: "{{ data_dir.flow }}"
+    local_action: file path="{{ item[0] }}/{{ item[1] }}" state=directory
+    with_nested:
+      - [ "/tmp/{{ ssh_user }}", "{{ local_path }}" ]
+      - "{{ data_dir.flow }}"
 
   - name: Sync flow persistent data from remote server to local temp
     synchronize: mode=pull
@@ -14,7 +16,6 @@
     when: not from_cache|bool
 
   - name: Sync flow persistent data from local temp to working directory
-    local_action: synchronize src="/tmp/{{ ssh_user }}/{{ item }}"
-                  dest="{{ local_path }}/{{ item }}"
-                  delete=yes
+    local_action: shell rsync --delay-updates -F -z --delete-after -a --out-format='<<CHANGED>>%i %n%L' \
+                  /tmp/{{ ssh_user }}/{{ item }} {{ local_path }}/{{ item }}
     with_items: "{{ data_dir.flow }}"

ansible/roles/rsync/tasks/typo3.yml

@@ -2,8 +2,10 @@
 # tasks file for rsync
 
   - name: Make sure local temp directory exists
-    local_action: file path="/tmp/{{ ssh_user }}/{{ item }}" state=directory
-    with_items: "{{ data_dir.typo3 }}"
+    local_action: file path="{{ item[0] }}/{{ item[1] }}" state=directory
+    with_nested:
+      - [ "/tmp/{{ ssh_user }}", "{{ local_path }}" ]
+      - "{{ data_dir.typo3 }}"
 
   - name: Sync typo3 data from remote server to local temp
     synchronize: mode=pull
@@ -15,8 +17,7 @@
     when: not from_cache|bool
 
   - name: Sync typo3 data from local temp to working directory
-    local_action: synchronize src="/tmp/{{ ssh_user }}/{{ item }}"
-                  dest="{{ local_path }}/{{ item }}"
-                  delete=yes
-                  rsync_opts="--exclude=.gitkeep --exclude=_temp_ --exclude=_processed_"
+    local_action: shell rsync  --delay-updates -F -z --delete-after -a --out-format='<<CHANGED>>%i %n%L' \
+                  --exclude=.gitkeep --exclude=_temp_ --exclude=_processed_ \
+                  /tmp/{{ ssh_user }}/{{ item }} {{ local_path }}/{{ item }}
     with_items: "{{ data_dir.typo3 }}"