diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-22 16:49:00 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-22 16:49:00 -0400 |
| commit | 5d4c9a01cdd4bbb76bf644549ce6efc2ac0cfc8a (patch) | |
| tree | 06339fdb264d4d244fe96697a0a0259249b4aa4c | |
| parent | b7ed298359eaa69b1c00acd0edd101511765c6ea (diff) | |
| parent | 135f37c77145b08521a921dca81b843591b82c29 (diff) | |
| download | openshift-5d4c9a01cdd4bbb76bf644549ce6efc2ac0cfc8a.tar.gz openshift-5d4c9a01cdd4bbb76bf644549ce6efc2ac0cfc8a.tar.bz2 openshift-5d4c9a01cdd4bbb76bf644549ce6efc2ac0cfc8a.tar.xz openshift-5d4c9a01cdd4bbb76bf644549ce6efc2ac0cfc8a.zip | |
Merge pull request #1647 from dgoodwin/per-fsgroup-quota
Support setting local storage perFSGroup quota in node config.
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 1 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 263daf210..30e29787a 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1407,6 +1407,7 @@ class OpenShiftFacts(object): if 'node' in roles: defaults['node'] = dict(labels={}, annotations={}, iptables_sync_period='5s', + local_quota_per_fsgroup="", set_node_ip=False) if 'docker' in roles: diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 4b5832ab7..ca1e26459 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -31,6 +31,7 @@ node_image: "{{ osn_image | default(None) }}" ovs_image: "{{ osn_ovs_image | default(None) }}" proxy_mode: "{{ openshift_node_proxy_mode | default('iptables') }}" + local_quota_per_fsgroup: "{{ openshift_node_local_quota_per_fsgroup | default(None) }}" # We have to add tuned-profiles in the same transaction otherwise we run into depsolving # problems because the rpms don't pin the version properly. This was fixed in 3.1 packaging. diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 67975d372..28cb1ea26 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -38,3 +38,6 @@ volumeDirectory: {{ openshift.common.data_dir }}/openshift.local.volumes proxyArguments: proxy-mode: - {{ openshift.node.proxy_mode }} +volumeConfig: + localQuota: + perFSGroup: {{ openshift.node.local_quota_per_fsgroup }} |