| |
@@ -14,13 +14,13 @@
|
| |
|
| |
- name: Initialize docker and ansible playbook extra args variables
|
| |
set_fact:
|
| |
- my_docker_extra_args: null
|
| |
+ my_run_cmd_extra_args: null
|
| |
my_playbook_extra_args: null
|
| |
|
| |
- name: Configure python version-dependent argument settings
|
| |
set_fact:
|
| |
my_playbook_extra_args: "{{my_playbook_extra_args}} -e ansible_python_interpreter='/usr/bin/python{{docker_python_version}}'"
|
| |
- my_docker_extra_args: "{{my_docker_extra_args}} --py{{docker_python_version}}"
|
| |
+ my_run_cmd_extra_args: "{{my_run_cmd_extra_args}} --py{{docker_python_version}}"
|
| |
when: docker_python_version is defined and docker_python_version != 2
|
| |
|
| |
- name: Special case - pass along 'rpms' variable to playbook
|
| |
@@ -35,8 +35,9 @@
|
| |
-p '{{docker_ssh_port}}:22'
|
| |
-v '{{artifacts}}:/artifacts:z,rw'
|
| |
-v '{{role_path}}/files/docker-run-ssh:/run.sh:z'
|
| |
+ {{docker_extra_args}}
|
| |
'{{subjects}}'
|
| |
- /bin/sh -ex /run.sh {{my_docker_extra_args}}
|
| |
+ /bin/sh -ex /run.sh {{my_run_cmd_extra_args}}
|
| |
register: docker_run_output
|
| |
|
| |
- name: Capture docker container ID
|
| |
Rename var 'my_docker_extra_args' to avoid confusion, and add var
'docker_extra_args' for passing additional args to 'docker run'.
Signed-off-by: Boyang Xue bxue@redhat.com