summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-10 09:06:26 -0500
committerGitHub <noreply@github.com>2017-02-10 09:06:26 -0500
commit398b72dc31788ed8fd22497761ba16e1f013a108 (patch)
tree59cf2eb404575da1ae87baa1ab0af78b09b9fc11
parentfb6e445d1c44e74c9cb769f6243b5bdd5b64374e (diff)
parentd226d9b51e6eb1fe897d08e221dd28a34b35339c (diff)
downloadopenshift-398b72dc31788ed8fd22497761ba16e1f013a108.tar.gz
openshift-398b72dc31788ed8fd22497761ba16e1f013a108.tar.bz2
openshift-398b72dc31788ed8fd22497761ba16e1f013a108.tar.xz
openshift-398b72dc31788ed8fd22497761ba16e1f013a108.zip
Merge pull request #3320 from jcantrill/bz_1420538_metrics_supplemental_groups
bug 1420538. Allow users to set supplementalGroup for Cassandra
-rw-r--r--roles/openshift_metrics/defaults/main.yaml1
-rw-r--r--roles/openshift_metrics/templates/hawkular_cassandra_rc.j23
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml
index 45c4bf69a..485cd874c 100644
--- a/roles/openshift_metrics/defaults/main.yaml
+++ b/roles/openshift_metrics/defaults/main.yaml
@@ -23,6 +23,7 @@ openshift_metrics_cassandra_limits_cpu: null
openshift_metrics_cassandra_requests_memory: 1G
openshift_metrics_cassandra_requests_cpu: null
openshift_metrics_cassandra_nodeselector: ""
+openshift_metrics_cassandra_storage_group: 65534
openshift_metrics_heapster_standalone: False
openshift_metrics_heapster_limits_memory: 3.75G
diff --git a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
index 6f6efc469..504476dc4 100644
--- a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
+++ b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2
@@ -19,6 +19,9 @@ spec:
type: hawkular-cassandra
spec:
serviceAccount: cassandra
+ securityContext:
+ supplementalGroups:
+ - {{openshift_metrics_cassandra_storage_group}}
{% if node_selector is iterable and node_selector | length > 0 %}
nodeSelector:
{% for key, value in node_selector.iteritems() %}