summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks/registry_auth.yml
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-10 13:10:23 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-11 11:45:04 -0400
commitbb1d5f45255d60a88a3220ea7e7b724a073465b1 (patch)
tree7917fefb2a817c3f5446c8c6f8d489526651ee1c /roles/openshift_master/tasks/registry_auth.yml
parentc38f63cc4a7e8cf2942e5bc83ee92fbea7aa59fe (diff)
downloadopenshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.tar.gz
openshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.tar.bz2
openshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.tar.xz
openshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.zip
Fix broken debug_level
Currently, debug_level is documented as a way to change the debug output level for both masters and nodes. debug_level does not currently have any effect. This commit removes debug_level from openshift_facts and properly sets openshift_master_debug_level and openshift_node_debug_level to the value of debug_level specified in the inventory. This commit also reorganizes some set_fact tasks needed during master upgrades to put all work-around set-facts for undefined variables in one place, allowing for easier cleanup in the future. This includes an entry for openshift_master_debug_level. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500164
Diffstat (limited to 'roles/openshift_master/tasks/registry_auth.yml')
-rw-r--r--roles/openshift_master/tasks/registry_auth.yml10
1 files changed, 0 insertions, 10 deletions
diff --git a/roles/openshift_master/tasks/registry_auth.yml b/roles/openshift_master/tasks/registry_auth.yml
index 2644f235e..63d483760 100644
--- a/roles/openshift_master/tasks/registry_auth.yml
+++ b/roles/openshift_master/tasks/registry_auth.yml
@@ -1,14 +1,4 @@
---
-# We need to setup some variables as this play might be called directly
-# from outside of the role.
-- set_fact:
- oreg_auth_credentials_path: "{{ r_openshift_master_data_dir }}/.docker"
- when: oreg_auth_credentials_path is not defined
-
-- set_fact:
- oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}"
- when: oreg_host is not defined
-
- name: Check for credentials file for registry auth
stat:
path: "{{ oreg_auth_credentials_path }}"