diff options
| -rw-r--r-- | ansible/roles/trove-setup/tasks/lorry-controller-setup.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/trove-setup/tasks/releases.yml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml b/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml index f839ca8..4b1b177 100644 --- a/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml +++ b/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml @@ -5,7 +5,8 @@ - name: Create the TROVE_ID/local-config/lorries repository shell: | su git -c 'ssh localhost create '{{ TROVE_ID|quote|quote|quote }}'/local-config/lorries' - creates=/home/git/repos/{{ TROVE_ID|regex_replace('(\\W)', '\\\\\\1')}}/local-config/lorries.git + args: + creates: /home/git/repos/{{ TROVE_ID }}/local-config/lorries.git - name: Create a temporary folder to copy templates shell: su git -c 'mktemp -d' register: lorry_controller_templates @@ -47,7 +48,8 @@ su git -c 'cp /usr/share/trove-setup/closed-source-lorries/README '{{ lorry_controller_repository.stdout|quote|quote }}'/lorries/closed-source-lorries/README' su git -c 'cd '{{ lorry_controller_repository.stdout|quote|quote }}'/lorries; git add README lorry-controller.conf open-source-lorries/README closed-source-lorries/README; git commit -m "Initial configuration"; git push origin master' su git -c 'rm -rf '{{ lorry_controller_repository.stdout|quote|quote }} - creates=/home/git/repos/{{ TROVE_ID|regex_replace('(\\W)', '\\\\\\1')}}/local-config/lorries.git/refs/heads/master + args: + creates: /home/git/repos/{{ TROVE_ID }}/local-config/lorries.git/refs/heads/master # Migration: Remove the old lorry-controller cronjob if exists - name: Look for lorry-controller old cronjob (This task can fail) diff --git a/ansible/roles/trove-setup/tasks/releases.yml b/ansible/roles/trove-setup/tasks/releases.yml index bcb031e..f8a1810 100644 --- a/ansible/roles/trove-setup/tasks/releases.yml +++ b/ansible/roles/trove-setup/tasks/releases.yml @@ -4,7 +4,8 @@ - name: Create the releases repository shell: | su git -c 'ssh localhost create '{{ TROVE_ID|quote|quote|quote }}'/site/releases' - creates=/home/git/repos/{{ TROVE_ID|regex_replace('(\\W)', '\\\\\\1')}}/site/releases.git + args: + creates: /home/git/repos/{{ TROVE_ID }}/site/releases.git - name: Create temporary folder to copy templates shell: su git -c 'mktemp -d' @@ -21,7 +22,8 @@ su git -c 'cp '{{ releases_templates.stdout|quote|quote }}'/releases-repo-README '{{ releases_repository.stdout|quote|quote }}'/releases/README' su git -c 'cd '{{ releases_repository.stdout|quote|quote }}'/releases; git add README; git commit -m "Add README"; git push origin master' su -c "rm -Rf {{ releases_repository.stdout|quote|quote }}" - creates=/home/git/repos/{{ TROVE_ID|regex_replace('(\\W)', '\\\\\\1')}}/site/releases.git/refs/heads/master + args: + creates: /home/git/repos/{{ TROVE_ID }}/site/releases.git/refs/heads/master - name: Link the releases repository to enable the access throught browser file: | |