summaryrefslogtreecommitdiffstats
path: root/roles/docker/defaults
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-13 17:15:39 -0400
committerGitHub <noreply@github.com>2017-09-13 17:15:39 -0400
commita0086cbeefc583ec624ae7b00548cd6f3cfbfadf (patch)
tree625571856345872ae16bcf861ac9465e712a2647 /roles/docker/defaults
parent581d5d2dd18688bcf70722d6126730691cdd82fa (diff)
parentdb30a2eb386930e0b20c8106e334d605e2ae770a (diff)
downloadopenshift-a0086cbeefc583ec624ae7b00548cd6f3cfbfadf.tar.gz
openshift-a0086cbeefc583ec624ae7b00548cd6f3cfbfadf.tar.bz2
openshift-a0086cbeefc583ec624ae7b00548cd6f3cfbfadf.tar.xz
openshift-a0086cbeefc583ec624ae7b00548cd6f3cfbfadf.zip
Merge pull request #5359 from mgugino-upstream-stage/version-docker-auth-config
Merged by openshift-bot
Diffstat (limited to 'roles/docker/defaults')
-rw-r--r--roles/docker/defaults/main.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index ed97d539c..7e206ded1 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -1 +1,6 @@
---
+docker_cli_auth_config_path: '/root/.docker'
+
+oreg_url: ''
+oreg_host: "{{ oreg_url.split('/')[0] if '.' in oreg_url.split('/')[0] else '' }}"
+oreg_auth_credentials_replace: False