From 92df63eb590d6238c1bd46a0eecca2a6b712713f Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Tue, 18 Jul 2017 10:48:03 -0500 Subject: Adding podpreset config into master-config --- roles/openshift_service_catalog/tasks/wire_aggregator.yml | 6 ++++++ 1 file changed, 6 insertions(+) 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 -- cgit v1.2.3 From e05875406a7bd88ee57b703805766699726c6409 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Tue, 18 Jul 2017 12:40:44 -0500 Subject: Setting node selector to be empty string --- roles/openshift_service_catalog/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: > -- cgit v1.2.3