Merge pull request #4781 from ewolinetz/pod_preset_config

Adding podpreset config into master-config

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: >

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