Merge branch 'master' of github.com:openshift/openshift-ansible into rm_origin-components

3 files changed, 26 insertions, 1 deletions

diff --git a/roles/openshift_web_console/defaults/main.yml b/roles/openshift_web_console/defaults/main.yml
index c747f73a8..627db393a 100644
--- a/roles/openshift_web_console/defaults/main.yml
+++ b/roles/openshift_web_console/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-openshift_web_console_nodeselector: "{{ openshift_hosted_infra_selector | default('region=infra') | map_from_pairs }}"
+openshift_web_console_nodeselector: {"node-role.kubernetes.io/master":"true"}
diff --git a/roles/openshift_web_console/files/console-template.yaml b/roles/openshift_web_console/files/console-template.yaml
index 7bf2d0cf4..547e7a265 100644
--- a/roles/openshift_web_console/files/console-template.yaml
+++ b/roles/openshift_web_console/files/console-template.yaml
@@ -71,6 +71,10 @@ objects:
               path: /
               port: 8443
               scheme: HTTPS
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
         nodeSelector: "${{NODE_SELECTOR}}"
         volumes:
         - name: serving-cert
@@ -112,6 +116,8 @@ objects:
       app: openshift-web-console
     annotations:
       service.alpha.openshift.io/serving-cert-secret-name: webconsole-serving-cert
+      prometheus.io/scrape: "true"
+      prometheus.io/scheme: https
   spec:
     selector:
       webconsole: "true"
diff --git a/roles/openshift_web_console/tasks/remove_old_asset_config.yml b/roles/openshift_web_console/tasks/remove_old_asset_config.yml
new file mode 100644
index 000000000..34158150c
--- /dev/null
+++ b/roles/openshift_web_console/tasks/remove_old_asset_config.yml
@@ -0,0 +1,19 @@
+---
+# Remove the obsolete assetConfig stanza from master-config.yaml. Since the
+# web console has been split out into a separate deployment, those settings
+# are no longer used.
+- name: Remove assetConfig from master-config.yaml
+  yedit:
+    state: absent
+    src: "{{ openshift.common.config_base }}/master/master-config.yaml"
+    key: assetConfig
+
+# This file was written by wire_aggregator.yml. It is no longer needed since
+# the web console now discovers if the template service broker is running on
+# startup. Remove the file if it exists.
+- name: Remove obsolete web console / service catalog extension file
+  file:
+    state: absent
+    # Hard-code the path instead of using `openshift.common.config_base` since
+    # the path is hard-coded in wire_aggregator.yml.
+    path: /etc/origin/master/openshift-ansible-catalog-console.js