summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-23 14:45:53 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-23 14:45:53 -0500
commitcb3da200563684c15d3a65cb2bf3958b9a34b249 (patch)
tree0df5819dce7da8e129bdc58d8d8c57683f7a47e0 /roles/openshift_master/tasks
parent11c29f01724258ed21ee41f3df790a6d8d110ec0 (diff)
parent783309075eb284f7c605817502418773e3463992 (diff)
downloadopenshift-cb3da200563684c15d3a65cb2bf3958b9a34b249.tar.gz
openshift-cb3da200563684c15d3a65cb2bf3958b9a34b249.tar.bz2
openshift-cb3da200563684c15d3a65cb2bf3958b9a34b249.tar.xz
openshift-cb3da200563684c15d3a65cb2bf3958b9a34b249.zip
Merge pull request #909 from detiber/mappingMethod
Add mappingMethod to identityProviders config
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml16
1 files changed, 11 insertions, 5 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 185bfb8f3..2cf2a53c4 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -1,13 +1,16 @@
---
-# TODO: add validation for openshift_master_identity_providers
# TODO: add ability to configure certificates given either a local file to
# point to or certificate contents, set in default cert locations.
-- assert:
- that:
- - openshift_master_oauth_grant_method in openshift_master_valid_grant_methods
- when: openshift_master_oauth_grant_method is defined
+# Authentication Variable Validation
+# TODO: validate the different identity provider kinds as well
+- fail:
+ msg: >
+ Invalid OAuth grant method: {{ openshift_master_oauth_grant_method }}
+ when: openshift_master_oauth_grant_method is defined and openshift_master_oauth_grant_method not in openshift_master_valid_grant_methods
+
+# HA Variable Validation
- fail:
msg: "openshift_master_cluster_method must be set to either 'native' or 'pacemaker' for multi-master installations"
when: openshift_master_ha | bool and ((openshift_master_cluster_method is not defined) or (openshift_master_cluster_method is defined and openshift_master_cluster_method not in ["native", "pacemaker"]))
@@ -172,6 +175,9 @@
- restart master
- restart master api
+- set_fact:
+ translated_identity_providers: "{{ openshift.master.identity_providers | translate_idps('v1') }}"
+
# TODO: add the validate parameter when there is a validation command to run
- name: Create master config
template: