RSulzmann closed pull request #3394: fix deploy.yml URL: https://github.com/apache/incubator-openwhisk/pull/3394
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/ansible/roles/cli/tasks/deploy.yml b/ansible/roles/cli/tasks/deploy.yml index b2c51d1604..808be75331 100644 --- a/ansible/roles/cli/tasks/deploy.yml +++ b/ansible/roles/cli/tasks/deploy.yml @@ -15,6 +15,8 @@ path: "{{ openwhisk_build_dir }}/{{ openwhisk_cli.archive_name }}" state: directory mode: 0777 + become: "{{ openwhisk_cli.nginxdir.become }}" + # # Why are we unarchiving into the build directory instead of directly into @@ -31,12 +33,14 @@ url: "{{ openwhisk_cli.remote.location }}/{{ openwhisk_cli.archive_name}}-{{ openwhisk_cli_tag }}-all.tgz" dest: "{{ openwhisk_build_dir }}/{{ openwhisk_cli.archive_name }}.tgz" headers: "{{ openwhisk_cli.remote.headers | default('') }}" + mode: 0777 when: openwhisk_cli.installation_mode == "remote" - name: "... or Copy release archive to build directory" copy: src: "{{ openwhisk_cli_home }}/release/{{ openwhisk_cli.archive_name}}-{{ openwhisk_cli_tag }}-all.tgz" dest: "{{ openwhisk_build_dir }}/{{ openwhisk_cli.archive_name }}.tgz" + mode: 0777 when: openwhisk_cli.installation_mode == "local" # @@ -49,10 +53,7 @@ -C {{ openwhisk_build_dir }}/{{ openwhisk_cli.archive_name }}/ - name: "Copy expanded archive to final configuration directory" - copy: - # WARNING: The trailing slash is significant, signalling to copy contents - src: "{{ openwhisk_build_dir }}/{{ openwhisk_cli.archive_name }}/" - dest: "{{ openwhisk_cli.nginxdir.name }}" + shell: cp -r {{ openwhisk_build_dir }}/{{ openwhisk_cli.archive_name }}/* {{ openwhisk_cli.nginxdir.name }} - name: "Delete archive from build directory" file: @@ -82,8 +83,5 @@ register: individual_zipfiles - name: "Unarchive the individual zipfiles into binaries" - unarchive: - remote_src: yes - src: "{{ item.path }}" - dest: "{{ item.path | dirname }}" + command: "unzip -d {{ item.path | dirname }} {{ item.path }}" with_items: "{{ individual_zipfiles.files }}" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services