Browse Source

Add masterConfig.volumeConfig.dynamicProvisioningEnabled

Scott Dodson 9 years ago
parent
commit
56ba4b7343

+ 2 - 0
inventory/byo/hosts.aep.example

@@ -381,6 +381,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Or you may optionally define your own serialized as json
 #openshift_builddefaults_json='{"BuildDefaults":{"configuration":{"apiVersion":"v1","env":[{"name":"HTTP_PROXY","value":"http://proxy.example.com.redhat.com:3128"},{"name":"NO_PROXY","value":"ose3-master.example.com"}],"gitHTTPProxy":"http://proxy.example.com:3128","kind":"BuildDefaultsConfig"}}}'
 
+# masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default
+#openshift_master_dynamic_provisioning_enabled=False
 
 
 # host group for masters

+ 2 - 0
inventory/byo/hosts.origin.example

@@ -386,6 +386,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Or you may optionally define your own serialized as json
 #openshift_builddefaults_json='{"BuildDefaults":{"configuration":{"apiVersion":"v1","env":[{"name":"HTTP_PROXY","value":"http://proxy.example.com.redhat.com:3128"},{"name":"NO_PROXY","value":"ose3-master.example.com"}],"gitHTTPProxy":"http://proxy.example.com:3128","kind":"BuildDefaultsConfig"}}}'
 
+# masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default
+#openshift_master_dynamic_provisioning_enabled=False
 
 # host group for masters
 [masters]

+ 3 - 0
inventory/byo/hosts.ose.example

@@ -382,6 +382,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Or you may optionally define your own serialized as json
 #openshift_builddefaults_json='{"BuildDefaults":{"configuration":{"apiVersion":"v1","env":[{"name":"HTTP_PROXY","value":"http://proxy.example.com.redhat.com:3128"},{"name":"NO_PROXY","value":"ose3-master.example.com"}],"gitHTTPProxy":"http://proxy.example.com:3128","kind":"BuildDefaultsConfig"}}}'
 
+# masterConfig.volumeConfig.dynamicProvisioningEnabled, configurable as of 1.2/3.2, enabled by default
+#openshift_master_dynamic_provisioning_enabled=False
+
 # host group for masters
 [masters]
 ose3-master[1:3]-ansible.test.example.com

+ 2 - 1
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={},

+ 2 - 0
roles/openshift_master/templates/master.yaml.v1.j2

@@ -209,3 +209,5 @@ servingInfo:
 {% endfor %}
 {% endfor %}
 {% endif %}
+volumeConfig:
+  dynamicProvisioningEnabled: {{ openshift.master.dynamic_provisioning_enabled }}

+ 1 - 0
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) }}"