From c030f987ca7b1baead6c36265a93db238f9d0479 Mon Sep 17 00:00:00 2001 From: Boyang Xue Date: Jun 09 2017 02:48:51 +0000 Subject: standard-test-docker: rename 'my_docker_extra_args' and add 'docker_extra_args' 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 --- diff --git a/roles/standard-test-docker/defaults/main.yml b/roles/standard-test-docker/defaults/main.yml index 6c8e928..89e3679 100644 --- a/roles/standard-test-docker/defaults/main.yml +++ b/roles/standard-test-docker/defaults/main.yml @@ -1,2 +1,3 @@ --- docker_python_version: 2 +docker_extra_args: null diff --git a/roles/standard-test-docker/tasks/main.yml b/roles/standard-test-docker/tasks/main.yml index a2830a5..e6372aa 100644 --- a/roles/standard-test-docker/tasks/main.yml +++ b/roles/standard-test-docker/tasks/main.yml @@ -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