summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-12 20:48:14 -0400
committerGitHub <noreply@github.com>2017-07-12 20:48:14 -0400
commit9c2d56757c87a6de184605f23090a987ada44952 (patch)
tree87db2aa8bfd7aecf51ff437ff435ab778f2277bf
parent49fe86f05421a10d911727e3fa81f373deb038e3 (diff)
parent64767cee27d528cee5c72d40020839e27707210d (diff)
downloadopenshift-9c2d56757c87a6de184605f23090a987ada44952.tar.gz
openshift-9c2d56757c87a6de184605f23090a987ada44952.tar.bz2
openshift-9c2d56757c87a6de184605f23090a987ada44952.tar.xz
openshift-9c2d56757c87a6de184605f23090a987ada44952.zip
Merge pull request #4743 from ewolinetz/bz1469986
Created js file for enabling tech preview for console, updated master…
-rw-r--r--roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js2
-rw-r--r--roles/openshift_service_catalog/tasks/wire_aggregator.yml9
2 files changed, 11 insertions, 0 deletions
diff --git a/roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js b/roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js
new file mode 100644
index 000000000..1f25cc39f
--- /dev/null
+++ b/roles/openshift_service_catalog/files/openshift-ansible-catalog-console.js
@@ -0,0 +1,2 @@
+window.OPENSHIFT_CONSTANTS.ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page = true;
+window.OPENSHIFT_CONSTANTS.ENABLE_TECH_PREVIEW_FEATURE.pod_presets = true;
diff --git a/roles/openshift_service_catalog/tasks/wire_aggregator.yml b/roles/openshift_service_catalog/tasks/wire_aggregator.yml
index cbb29e623..55e68dc00 100644
--- a/roles/openshift_service_catalog/tasks/wire_aggregator.yml
+++ b/roles/openshift_service_catalog/tasks/wire_aggregator.yml
@@ -119,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
@@ -138,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