diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-11-10 12:42:48 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-11-22 12:05:13 -0500 |
| commit | efecf62dc56a621e21962f66553d5ad3872286e5 (patch) | |
| tree | 5b200a1f110b68680323faea708c76c1b7a2ea8b /roles/openshift_master_facts/tasks | |
| parent | e2d6fe37d6a599715d3136cd396ca8f27b5fb9b7 (diff) | |
| download | openshift-efecf62dc56a621e21962f66553d5ad3872286e5.tar.gz openshift-efecf62dc56a621e21962f66553d5ad3872286e5.tar.bz2 openshift-efecf62dc56a621e21962f66553d5ad3872286e5.tar.xz openshift-efecf62dc56a621e21962f66553d5ad3872286e5.zip | |
Merge kube_admission_plugin_config with admission_plugin_config
Move the values in kube_admission_plugin_config up one level per
the new format from 1.3:
"The kubernetesMasterConfig.admissionConfig.pluginConfig should be moved
and merged into admissionConfig.pluginConfig."
Diffstat (limited to 'roles/openshift_master_facts/tasks')
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index 62ac1aef5..1f27a2c1d 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -66,10 +66,8 @@ master_image: "{{ osm_image | default(None) }}" scheduler_predicates: "{{ openshift_master_scheduler_predicates | default(None) }}" scheduler_priorities: "{{ openshift_master_scheduler_priorities | default(None) }}" - admission_plugin_order: "{{openshift_master_admission_plugin_order | default(None) }}" admission_plugin_config: "{{openshift_master_admission_plugin_config | default(None) }}" - kube_admission_plugin_order: "{{openshift_master_kube_admission_plugin_order | default(None) }}" - kube_admission_plugin_config: "{{openshift_master_kube_admission_plugin_config | default(None) }}" + 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) }}" |