diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-30 12:50:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 12:50:52 -0700 |
| commit | f5594776a2cde617316597f5d4a5ffe85dfc8b18 (patch) | |
| tree | d6de91afc158c4d73fd4b80c1e755fdceb997c7e | |
| parent | adb1d12a72479ad9e1ebb648b3c13fe8768f03fc (diff) | |
| parent | 28ebfa656bc3fd99d33239fc346570da672d5f71 (diff) | |
| download | openshift-f5594776a2cde617316597f5d4a5ffe85dfc8b18.tar.gz openshift-f5594776a2cde617316597f5d4a5ffe85dfc8b18.tar.bz2 openshift-f5594776a2cde617316597f5d4a5ffe85dfc8b18.tar.xz openshift-f5594776a2cde617316597f5d4a5ffe85dfc8b18.zip | |
Merge pull request #5888 from jcantrill/1501599_allow_project_overcommit
Automatic merge from submit-queue.
bug 1501599. Omit logging project from overcommit restrictions
This PR:
* Annotates the logging project to remove overcommit restrictions
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 668a3f7e7..b98e281a3 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -36,6 +36,14 @@ - openshift_logging_label_key != "" - openshift_logging_label_value is defined +- name: Annotate Logging Project to allow overcommit + oc_edit: + kind: ns + name: "{{ openshift_logging_namespace }}" + separator: '#' + content: + metadata#annotations#quota.openshift.io/cluster-resource-override-enabled: "false" + - name: Create logging cert directory file: path: "{{ openshift.common.config_base }}/logging" |