Merge branch 'master' into rm_origin-components

3 files changed, 45 insertions, 36 deletions

diff --git a/roles/openshift_web_console/files/console-config.yaml b/roles/openshift_web_console/files/console-config.yaml
index 32a28775f..55c650fbe 100644
--- a/roles/openshift_web_console/files/console-config.yaml
+++ b/roles/openshift_web_console/files/console-config.yaml
@@ -12,6 +12,7 @@ extensions:
   properties: null
 features:
   inactivityTimeoutMinutes: 0
+  clusterResourceOverridesEnabled: false
 servingInfo:
   bindAddress: 0.0.0.0:8443
   bindNetwork: tcp4
diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml
index ead62799a..cc5eef47d 100644
--- a/roles/openshift_web_console/tasks/install.yml
+++ b/roles/openshift_web_console/tasks/install.yml
@@ -86,6 +86,8 @@
             value: "{{ openshift.master.logout_url | default('') }}"
           - key: features#inactivityTimeoutMinutes
             value: "{{ openshift_web_console_inactivity_timeout_minutes | default(0) }}"
+          - key: features#clusterResourceOverridesEnabled
+            value: "{{ openshift_web_console_cluster_resource_overrides_enabled | default(false) }}"
           - key: extensions#scriptURLs
             value: "{{ openshift_web_console_extension_script_urls | default([]) }}"
           - key: extensions#stylesheetURLs
diff --git a/roles/openshift_web_console/tasks/update_console_config.yml b/roles/openshift_web_console/tasks/update_console_config.yml
index 4d2957977..967222ea4 100644
--- a/roles/openshift_web_console/tasks/update_console_config.yml
+++ b/roles/openshift_web_console/tasks/update_console_config.yml
@@ -19,43 +19,49 @@
 #         value: "https://{{ openshift_logging_kibana_hostname }}"
 #   when: openshift_web_console_install | default(true) | bool
 
-- name: Read web console config map
+- name: Read the existing web console config map
   oc_configmap:
     namespace: openshift-web-console
     name: webconsole-config
     state: list
-  register: webconsole_config
-
-- name: Make temp directory
-  command: mktemp -d /tmp/console-ansible-XXXXXX
-  register: mktemp_console
-  changed_when: False
-
-- name: Copy web console config to temp file
-  copy:
-    content: "{{webconsole_config.results.results[0].data['webconsole-config.yaml']}}"
-    dest: "{{ mktemp_console.stdout }}/webconsole-config.yaml"
-
-- name: Change web console config properties
-  yedit:
-    src: "{{ mktemp_console.stdout }}/webconsole-config.yaml"
-    edits: "{{console_config_edits}}"
-    separator: '#'
-    state: present
-
-- name: Update web console config map
-  oc_configmap:
-    namespace: openshift-web-console
-    name: webconsole-config
-    state: present
-    from_file:
-      webconsole-config.yaml: "{{ mktemp_console.stdout }}/webconsole-config.yaml"
-
-- name: Remove temp directory
-  file:
-    state: absent
-    name: "{{ mktemp_console.stdout }}"
-  changed_when: False
-
-# TODO: Only rollout if config has changed.
-- include_tasks: rollout_console.yml
+  register: webconsole_config_map
+
+- set_fact:
+    existing_config_map_data: "{{ webconsole_config_map.results.results[0].data | default({}) }}"
+
+- when: existing_config_map_data['webconsole-config.yaml'] is defined
+  block:
+  - name: Make temp directory
+    command: mktemp -d /tmp/console-ansible-XXXXXX
+    register: mktemp_console
+    changed_when: False
+
+  - name: Copy the existing web console config to temp directory
+    copy:
+      content: "{{ existing_config_map_data['webconsole-config.yaml'] }}"
+      dest: "{{ mktemp_console.stdout }}/webconsole-config.yaml"
+
+  - name: Change web console config properties
+    yedit:
+      src: "{{ mktemp_console.stdout }}/webconsole-config.yaml"
+      edits: "{{console_config_edits}}"
+      separator: '#'
+      state: present
+
+  - name: Update web console config map
+    oc_configmap:
+      namespace: openshift-web-console
+      name: webconsole-config
+      state: present
+      from_file:
+        webconsole-config.yaml: "{{ mktemp_console.stdout }}/webconsole-config.yaml"
+    register: update_console_config_map
+
+  - name: Remove temp directory
+    file:
+      state: absent
+      name: "{{ mktemp_console.stdout }}"
+    changed_when: False
+
+  - include_tasks: rollout_console.yml
+    when: update_console_config_map.changed | bool