diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-27 11:21:04 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-27 11:21:04 -0400 |
| commit | 287b9527290bb01e88f43ea6a955795edcf24f38 (patch) | |
| tree | 1f5d3fbcf5f1351b71781b3ef4fd98b126e7c390 /roles | |
| parent | 0c2ad737bf5ef855c0ee9c4a558bc5ead6a4fa7e (diff) | |
| parent | 56ba4b734399c850f1fa7732d5baa38fccbad740 (diff) | |
| download | openshift-287b9527290bb01e88f43ea6a955795edcf24f38.tar.gz openshift-287b9527290bb01e88f43ea6a955795edcf24f38.tar.bz2 openshift-287b9527290bb01e88f43ea6a955795edcf24f38.tar.xz openshift-287b9527290bb01e88f43ea6a955795edcf24f38.zip | |
Merge pull request #1812 from sdodson/issue1759
Add masterConfig.volumeConfig.dynamicProvisioningEnabled
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 3 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index f733fd5a8..8d7f12bc8 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1692,7 +1692,8 @@ class OpenShiftFacts(object): auth_token_max_seconds=500, oauth_grant_method='auto', scheduler_predicates=scheduler_predicates, - scheduler_priorities=scheduler_priorities) + scheduler_priorities=scheduler_priorities, + dynamic_provisioning_enabled=True) if 'node' in roles: defaults['node'] = dict(labels={}, annotations={}, diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 979b428bf..48bb8a13f 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -209,3 +209,5 @@ servingInfo: {% endfor %} {% endfor %} {% endif %} +volumeConfig: + dynamicProvisioningEnabled: {{ openshift.master.dynamic_provisioning_enabled }} diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index 090511864..7e80f1f01 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -76,3 +76,4 @@ oauth_templates: "{{ openshift_master_oauth_templates | default(None) }}" oauth_always_show_provider_selection: "{{ openshift_master_oauth_always_show_provider_selection | default(None) }}" image_policy_config: "{{ openshift_master_image_policy_config | default(None) }}" + dynamic_provisioning_enabled: "{{ openshift_master_dynamic_provisioning_enabled | default(None) }}" |