summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTudor Tabacel <Tudor.Tabacel-Manea@bmw-carit.de>2018-11-09 14:20:17 +0100
committerClark Boylan <clark.boylan@gmail.com>2018-11-19 14:17:31 -0800
commit719f214db721a212273ddfb6c53c3134a8905fb6 (patch)
treed5a74682968166d334695b2c93036581cae50b9f
parentf6de96597f09cb8d8cd16292fedba1f7e3f6e57a (diff)
mirror-workspace-git: use port when pushing git repo through ssh
In the case of using a custom SSH port to connect to the ansible host, the task of pushing the repository failed, as it assumed the SSH port to be the default 22. Now the command is aware of the custom SSH port, as it is specified in the host facts. Note that we have to escape the hostname if it is an ipv6 address (because : is a special character in ipv6 addresses). Thankfully ansible provides a filter to do that for us: https://docs.ansible.com/ansible/2.5/user_guide/playbooks_filters_ipaddr.html#wrapping-ipv6-addresses-in-brackets Change-Id: I76969850fc3a57078370fe38efdebac146720797
Notes
Notes (review): Code-Review+1: Doug Hellmann <doug@doughellmann.com> Code-Review+1: Logan V <logan2211@gmail.com> Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Workflow+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 20 Nov 2018 17:26:53 +0000 Reviewed-on: https://review.openstack.org/618859 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/mirror-workspace-git-repos/tasks/main.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/mirror-workspace-git-repos/tasks/main.yaml b/roles/mirror-workspace-git-repos/tasks/main.yaml
index 2c9f191..c3baae7 100644
--- a/roles/mirror-workspace-git-repos/tasks/main.yaml
+++ b/roles/mirror-workspace-git-repos/tasks/main.yaml
@@ -7,7 +7,7 @@
7 with_dict: "{{ zuul.projects }}" 7 with_dict: "{{ zuul.projects }}"
8 8
9- name: Synchronize src repos to workspace directory 9- name: Synchronize src repos to workspace directory
10 command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.value.src_dir}}" 10 command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host | ipwrap }}:{{ ansible_port }}/{{ ansible_user_dir }}/{{ item.value.src_dir}}"
11 args: 11 args:
12 chdir: "{{ zuul.executor.work_root }}/{{ item.value.src_dir }}" 12 chdir: "{{ zuul.executor.work_root }}/{{ item.value.src_dir }}"
13 with_dict: "{{ zuul.projects }}" 13 with_dict: "{{ zuul.projects }}"