diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-10-25 13:17:34 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-10-26 11:03:33 +0200 |
| commit | 1d77b02f72795cef4ce5a9552fcdb97d16b7e3b9 (patch) | |
| tree | 0618160504212ae216c744b65dea37a13ab9ae21 /roles/docker | |
| parent | 6f15609668be694f6676a3b73b32b685b2fe82b7 (diff) | |
| download | openshift-1d77b02f72795cef4ce5a9552fcdb97d16b7e3b9.tar.gz openshift-1d77b02f72795cef4ce5a9552fcdb97d16b7e3b9.tar.bz2 openshift-1d77b02f72795cef4ce5a9552fcdb97d16b7e3b9.tar.xz openshift-1d77b02f72795cef4ce5a9552fcdb97d16b7e3b9.zip | |
docker: set credentials when using system container
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 12 | ||||
| -rw-r--r-- | roles/docker/tasks/registry_auth.yml | 12 | ||||
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index d6aee0513..b16413f72 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -153,16 +153,6 @@ - set_fact: docker_service_status_changed: "{{ (r_docker_package_docker_start_result | changed) and (r_docker_already_running_result.stdout != 'ActiveState=active' ) }}" -- name: Check for credentials file for registry auth - stat: - path: "{{ docker_cli_auth_config_path }}/config.json" - when: oreg_auth_user is defined - register: docker_cli_auth_credentials_stat - -- name: Create credentials for docker cli registry auth - command: "docker --config={{ docker_cli_auth_config_path }} login -u {{ oreg_auth_user }} -p {{ oreg_auth_password }} {{ oreg_host }}" - when: - - oreg_auth_user is defined - - (not docker_cli_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool +- include: registry_auth.yml - meta: flush_handlers diff --git a/roles/docker/tasks/registry_auth.yml b/roles/docker/tasks/registry_auth.yml new file mode 100644 index 000000000..65ed60efa --- /dev/null +++ b/roles/docker/tasks/registry_auth.yml @@ -0,0 +1,12 @@ +--- +- name: Check for credentials file for registry auth + stat: + path: "{{ docker_cli_auth_config_path }}/config.json" + when: oreg_auth_user is defined + register: docker_cli_auth_credentials_stat + +- name: Create credentials for docker cli registry auth + command: "docker --config={{ docker_cli_auth_config_path }} login -u {{ oreg_auth_user }} -p {{ oreg_auth_password }} {{ oreg_host }}" + when: + - oreg_auth_user is defined + - (not docker_cli_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 726e8ada7..aa3b35ddd 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -173,4 +173,6 @@ - set_fact: docker_service_status_changed: "{{ r_docker_systemcontainer_docker_start_result | changed }}" +- include: registry_auth.yml + - meta: flush_handlers |