diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-09-22 10:37:54 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-09-22 10:42:24 -0400 |
| commit | 3d9af759fe9e69f0b4a83e69e16d7a5bd0d56b6f (patch) | |
| tree | ddc0ac274ee50464a5e2bc82ab1259708bb27ba4 /roles/openshift_node_upgrade/defaults | |
| parent | 91c1c6fc7323ca885956102248b2e5b18e5332c3 (diff) | |
| download | openshift-3d9af759fe9e69f0b4a83e69e16d7a5bd0d56b6f.tar.gz openshift-3d9af759fe9e69f0b4a83e69e16d7a5bd0d56b6f.tar.bz2 openshift-3d9af759fe9e69f0b4a83e69e16d7a5bd0d56b6f.tar.xz openshift-3d9af759fe9e69f0b4a83e69e16d7a5bd0d56b6f.zip | |
Fix registry_auth logic for upgrades
Currently, the logic for registry authentication is
not implemented correctly to account for upgrades of
containerized hosts.
Additionally, the logic to account for multiple runs
of openshift-ansible might cause registry authentication
credentials to not be mounted inside of containerized hosts.
This commit adds the necessary logic to ensure containerized
hosts retain registry credentials.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1494470
Diffstat (limited to 'roles/openshift_node_upgrade/defaults')
| -rw-r--r-- | roles/openshift_node_upgrade/defaults/main.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_node_upgrade/defaults/main.yml b/roles/openshift_node_upgrade/defaults/main.yml index 3d8704308..6507b015d 100644 --- a/roles/openshift_node_upgrade/defaults/main.yml +++ b/roles/openshift_node_upgrade/defaults/main.yml @@ -4,3 +4,9 @@ os_sdn_network_plugin_name: "redhat/openshift-ovs-subnet" openshift_node_data_dir_default: "{{ openshift_data_dir | default('/var/lib/origin') }}" openshift_node_data_dir: "{{ openshift_node_data_dir_default }}" + +# oreg_url is defined by user input +oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}" +oreg_auth_credentials_path: "{{ openshift_node_data_dir }}/.docker" +oreg_auth_credentials_replace: False +l_bind_docker_reg_auth: False |