diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-10 20:51:00 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-14 16:12:20 -0500 |
| commit | 0de92e0e4c85c876436ae21f61daee31c870705e (patch) | |
| tree | 468008319e0d91fbd8a1e6c3842b8867a65b0412 /roles/openshift_node/defaults | |
| parent | 7175c6f228f61b883d958c12ba5130f37a0615c4 (diff) | |
| download | openshift-0de92e0e4c85c876436ae21f61daee31c870705e.tar.gz openshift-0de92e0e4c85c876436ae21f61daee31c870705e.tar.bz2 openshift-0de92e0e4c85c876436ae21f61daee31c870705e.tar.xz openshift-0de92e0e4c85c876436ae21f61daee31c870705e.zip | |
Alternative method to create docker registry auth creds
Currently, the command 'docker login' is run when using
oreg with authentication.
On some hosts, such as hosts configured to use system containers,
the docker service is not running. 'docker login' will fail
without the docker service running.
This commit adds a module to idempotently add credentials
to the registry credentials file without the use of
'docker login'
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
Diffstat (limited to 'roles/openshift_node/defaults')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 0c6d8db38..95d2cdf14 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -85,6 +85,7 @@ oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_ur oreg_auth_credentials_path: "{{ openshift_node_data_dir }}/.docker" oreg_auth_credentials_replace: False l_bind_docker_reg_auth: False +openshift_docker_alternative_creds: "{{ (openshift_docker_use_system_container | default(False)) or (openshift_use_crio_only | default(False)) }}" # NOTE # r_openshift_node_*_default may be defined external to this role. |