diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-28 09:42:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 09:42:05 -0500 |
| commit | 68d883dd99c118c0374042f9d7ac5573aef0de7e (patch) | |
| tree | b1e1c498d98cc15eaffabe63811da9691d5ae7e8 /roles/openshift_master | |
| parent | 90fb07f40aa3945e71d3941bca54867c649bc95f (diff) | |
| parent | efecf62dc56a621e21962f66553d5ad3872286e5 (diff) | |
| download | openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.tar.gz openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.tar.bz2 openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.tar.xz openshift-68d883dd99c118c0374042f9d7ac5573aef0de7e.zip | |
Merge pull request #2836 from abutcher/BZ1393645
Merge admission plugin configs
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index a52ae578c..dc9226a5a 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -1,7 +1,4 @@ admissionConfig: -{% if 'admission_plugin_order' in openshift.master %} - pluginOrderOverride:{{ openshift.master.admission_plugin_order | to_padded_yaml(level=2) }} -{% endif %} {% if 'admission_plugin_config' in openshift.master %} pluginConfig:{{ openshift.master.admission_plugin_config | to_padded_yaml(level=2) }} {% endif %} @@ -116,13 +113,6 @@ kubernetesMasterConfig: - v1beta3 - v1 {% endif %} - admissionConfig: -{% if 'kube_admission_plugin_order' in openshift.master %} - pluginOrderOverride:{{ openshift.master.kube_admission_plugin_order | to_padded_yaml(level=3) }} -{% endif %} -{% if 'kube_admission_plugin_config' in openshift.master %} - pluginConfig:{{ openshift.master.kube_admission_plugin_config | to_padded_yaml(level=3) }} -{% endif %} apiServerArguments: {{ openshift.master.api_server_args | default(None) | to_padded_yaml( level=2 ) }} controllerArguments: {{ openshift.master.controller_args | default(None) | to_padded_yaml( level=2 ) }} masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }} |