diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-11 18:43:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 18:43:36 -0500 |
| commit | fa649787c6a19bbfffb16d9cce3f8e3f7de5a8a1 (patch) | |
| tree | 6c891a58fb0642d9e0f7399f139940fe46c919e9 /roles/openshift_master_facts/tasks/main.yml | |
| parent | fdc5829d6ca252e1574278cd1dc50e932378d98d (diff) | |
| parent | d3fefc32a727fe3c13159c4e9fe4399f35b487a8 (diff) | |
| download | openshift-fa649787c6a19bbfffb16d9cce3f8e3f7de5a8a1.tar.gz openshift-fa649787c6a19bbfffb16d9cce3f8e3f7de5a8a1.tar.bz2 openshift-fa649787c6a19bbfffb16d9cce3f8e3f7de5a8a1.tar.xz openshift-fa649787c6a19bbfffb16d9cce3f8e3f7de5a8a1.zip | |
Merge pull request #6614 from mgugino-upstream-stage/plugins-to-lib-utils
Move more plugins to lib_utils
Diffstat (limited to 'roles/openshift_master_facts/tasks/main.yml')
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index 85d0ac25c..f450c916a 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -57,6 +57,7 @@ access_token_max_seconds: "{{ openshift_master_access_token_max_seconds | default(None) }}" auth_token_max_seconds: "{{ openshift_master_auth_token_max_seconds | default(None) }}" identity_providers: "{{ openshift_master_identity_providers | default(None) }}" + # oo_htpasswd_users_from_file is a custom filter in role lib_utils htpasswd_users: "{{ openshift_master_htpasswd_users | default(lookup('file', openshift_master_htpasswd_file) | oo_htpasswd_users_from_file if openshift_master_htpasswd_file is defined else None) }}" manage_htpasswd: "{{ openshift_master_manage_htpasswd | default(true) }}" ldap_ca: "{{ openshift_master_ldap_ca | default(lookup('file', openshift_master_ldap_ca_file) if openshift_master_ldap_ca_file is defined else None) }}" @@ -90,6 +91,8 @@ - name: Set Default scheduler predicates and priorities set_fact: + # openshift_master_facts_default_predicates is a custom lookup plugin in + # role lib_utils openshift_master_scheduler_default_predicates: "{{ lookup('openshift_master_facts_default_predicates') }}" openshift_master_scheduler_default_priorities: "{{ lookup('openshift_master_facts_default_priorities') }}" |