diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-02 20:23:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 20:23:31 -0800 |
| commit | 893e89975afc9d4221cff409698ca632dd825977 (patch) | |
| tree | ff55a5f771438ef1ffcb70055ce9583979bdfa39 /roles/openshift_master_facts | |
| parent | 861b8620e45008df6cac601725b5a82e9f67907a (diff) | |
| parent | 89197481ce9f593ff5f7c2b37f0efbbfca61431e (diff) | |
| download | openshift-893e89975afc9d4221cff409698ca632dd825977.tar.gz openshift-893e89975afc9d4221cff409698ca632dd825977.tar.bz2 openshift-893e89975afc9d4221cff409698ca632dd825977.tar.xz openshift-893e89975afc9d4221cff409698ca632dd825977.zip | |
Merge pull request #6522 from mgugino-upstream-stage/oauth_template
Automatic merge from submit-queue.
Remove oauth_template bits from openshift_facts
This commit moves some deprecated variable logic
outside of openshift_facts and into role defaults.
Diffstat (limited to 'roles/openshift_master_facts')
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index ad9a21c96..85d0ac25c 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -74,8 +74,6 @@ master_count: "{{ openshift_master_count | default(None) }}" admission_plugin_config: "{{openshift_master_admission_plugin_config }}" kube_admission_plugin_config: "{{openshift_master_kube_admission_plugin_config | default(None) }}" # deprecated, merged with admission_plugin_config - oauth_template: "{{ openshift_master_oauth_template | default(None) }}" # deprecated in origin 1.2 / OSE 3.2 - oauth_templates: "{{ openshift_master_oauth_templates | default(None) }}" oauth_always_show_provider_selection: "{{ openshift_master_oauth_always_show_provider_selection | default(None) }}" image_policy_config: "{{ openshift_master_image_policy_config | default(None) }}" dynamic_provisioning_enabled: "{{ openshift_master_dynamic_provisioning_enabled | default(None) }}" |