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/tasks | |
| 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/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/upgrade/upgrade_scheduler.yml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index eea1401b8..b12a6b346 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -181,6 +181,7 @@ - restart master api - set_fact: + # translate_idps is a custom filter in role lib_utils translated_identity_providers: "{{ openshift.master.identity_providers | translate_idps('v1') }}" # TODO: add the validate parameter when there is a validation command to run diff --git a/roles/openshift_master/tasks/upgrade/upgrade_scheduler.yml b/roles/openshift_master/tasks/upgrade/upgrade_scheduler.yml index 8558bf3e9..995a5ab70 100644 --- a/roles/openshift_master/tasks/upgrade/upgrade_scheduler.yml +++ b/roles/openshift_master/tasks/upgrade/upgrade_scheduler.yml @@ -1,6 +1,8 @@ --- # Upgrade predicates - vars: + # openshift_master_facts_default_predicates is a custom lookup plugin in + # role lib_utils prev_predicates: "{{ lookup('openshift_master_facts_default_predicates', short_version=openshift_upgrade_min, deployment_type=openshift_deployment_type) }}" prev_predicates_no_region: "{{ lookup('openshift_master_facts_default_predicates', short_version=openshift_upgrade_min, deployment_type=openshift_deployment_type, regions_enabled=False) }}" default_predicates_no_region: "{{ lookup('openshift_master_facts_default_predicates', regions_enabled=False) }}" |