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 /inventory/byo | |
| 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 'inventory/byo')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 3 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 5a95ecf94..324e2477f 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -619,6 +619,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default #openshift_master_dynamic_provisioning_enabled=False +# Admission plugin config +#openshift_master_admission_plugin_config={"ProjectRequestLimit":{"configuration":{"apiVersion":"v1","kind":"ProjectRequestLimitConfig","limits":[{"selector":{"admin":"true"}},{"maxProjects":"1"}]}},"PodNodeConstraints":{"configuration":{"apiVersion":"v1","kind":"PodNodeConstraintsConfig"}}} + # Configure usage of openshift_clock role. #openshift_clock_enabled=true diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index be919c105..4a2925599 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -619,6 +619,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default #openshift_master_dynamic_provisioning_enabled=False +# Admission plugin config +#openshift_master_admission_plugin_config={"ProjectRequestLimit":{"configuration":{"apiVersion":"v1","kind":"ProjectRequestLimitConfig","limits":[{"selector":{"admin":"true"}},{"maxProjects":"1"}]}},"PodNodeConstraints":{"configuration":{"apiVersion":"v1","kind":"PodNodeConstraintsConfig"}}} + # Configure usage of openshift_clock role. #openshift_clock_enabled=true |