diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-18 16:09:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 16:09:46 -0400 |
| commit | fcd93e2dae1a4f2c3e4eb28e76b9b4b5bb5e1b67 (patch) | |
| tree | b8db134b63a23a1ecd924dd9d151a066f0071ac9 | |
| parent | 8e2be54c6f2f55368f33667a68a5693dc75b1027 (diff) | |
| parent | e05875406a7bd88ee57b703805766699726c6409 (diff) | |
| download | openshift-fcd93e2dae1a4f2c3e4eb28e76b9b4b5bb5e1b67.tar.gz openshift-fcd93e2dae1a4f2c3e4eb28e76b9b4b5bb5e1b67.tar.bz2 openshift-fcd93e2dae1a4f2c3e4eb28e76b9b4b5bb5e1b67.tar.xz openshift-fcd93e2dae1a4f2c3e4eb28e76b9b4b5bb5e1b67.zip | |
Merge pull request #4781 from ewolinetz/pod_preset_config
Adding podpreset config into master-config
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/tasks/wire_aggregator.yml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index 4d1a38e61..686857d94 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -23,7 +23,7 @@ oc_project: state: present name: "kube-service-catalog" -# node_selector: "{{ openshift_service_catalog_nodeselector | default(null) }}" + node_selector: "" - name: Make kube-service-catalog project network global command: > diff --git a/roles/openshift_service_catalog/tasks/wire_aggregator.yml b/roles/openshift_service_catalog/tasks/wire_aggregator.yml index 55e68dc00..d5291a99a 100644 --- a/roles/openshift_service_catalog/tasks/wire_aggregator.yml +++ b/roles/openshift_service_catalog/tasks/wire_aggregator.yml @@ -147,6 +147,12 @@ value: [/etc/origin/master/openshift-ansible-catalog-console.js] - key: kubernetesMasterConfig.apiServerArguments.runtime-config value: [apis/settings.k8s.io/v1alpha1=true] + - key: admissionConfig.pluginConfig.PodPreset.configuration.kind + value: DefaultAdmissionConfig + - key: admissionConfig.pluginConfig.PodPreset.configuration.apiVersion + value: v1 + - key: admissionConfig.pluginConfig.PodPreset.configuration.disable + value: false register: yedit_output #restart master serially here |