diff options
Diffstat (limited to 'roles/openshift_service_catalog/tasks')
-rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 5 | ||||
-rw-r--r-- | roles/openshift_service_catalog/tasks/wire_aggregator.yml | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index 1342c3d30..1f9ecc2b8 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -25,6 +25,11 @@ name: "kube-service-catalog" # node_selector: "{{ openshift_service_catalog_nodeselector | default(null) }}" +- name: Make kube-service-catalog project network global + command: > + oc adm pod-network make-projects-global kube-service-catalog + when: os_sdn_network_plugin_name | default('') == 'redhat/openshift-ovs-multitenant' + - include: generate_certs.yml - copy: diff --git a/roles/openshift_service_catalog/tasks/wire_aggregator.yml b/roles/openshift_service_catalog/tasks/wire_aggregator.yml index b8b8d0863..55e68dc00 100644 --- a/roles/openshift_service_catalog/tasks/wire_aggregator.yml +++ b/roles/openshift_service_catalog/tasks/wire_aggregator.yml @@ -47,6 +47,7 @@ fetch: src: "/etc/origin/master/{{ item }}" dest: "{{ certtemp.stdout }}/{{ item }}" + flat: yes with_items: - front-proxy-ca.crt - front-proxy-ca.key @@ -98,6 +99,7 @@ fetch: src: "/etc/origin/master/{{ item }}" dest: "{{ certtemp.stdout }}/{{ item }}" + flat: yes delegate_to: "{{ first_master }}" with_items: - aggregator-front-proxy.crt @@ -117,6 +119,11 @@ when: - not front_proxy_kubeconfig.stat.exists +- name: copy tech preview extension file for service console UI + copy: + src: openshift-ansible-catalog-console.js + dest: /etc/origin/master/openshift-ansible-catalog-console.js + - name: Update master config yedit: state: present @@ -136,6 +143,10 @@ value: [X-Remote-Group] - key: authConfig.requestHeader.extraHeaderPrefixes value: [X-Remote-Extra-] + - key: assetConfig.extensionScripts + value: [/etc/origin/master/openshift-ansible-catalog-console.js] + - key: kubernetesMasterConfig.apiServerArguments.runtime-config + value: [apis/settings.k8s.io/v1alpha1=true] register: yedit_output #restart master serially here |