Browse Source

Merge pull request #9478 from AlbertoPeon/openstack_provisioner_ignore_az

Allow to configure BlockStorage.ignore-volume-az for Openstack Cloud Provider
OpenShift Merge Robot 6 years ago
parent
commit
c13a23a1c7

+ 1 - 0
roles/openshift_cloud_provider/defaults/main.yml

@@ -4,3 +4,4 @@ openshift_gcp_prefix: ''
 openshift_gcp_network_name: "{{ openshift_gcp_prefix }}network"
 openshift_gcp_multizone: False
 openshift_openstack_ca_file_path: '/etc/origin/cloudprovider/openstack.crt'
+openshift_cloudprovider_openstack_blockstorage_ignore_volume_az: false

+ 2 - 1
roles/openshift_cloud_provider/templates/openstack.conf.j2

@@ -22,7 +22,8 @@ ca-file = {{ openshift_openstack_ca_file_path }}
 [LoadBalancer]
 subnet-id = {{ openshift_cloudprovider_openstack_lb_subnet_id }}
 {% endif %}
-{% if openshift_cloudprovider_openstack_blockstorage_version is defined %}
 [BlockStorage]
+ignore-volume-az = {{ openshift_cloudprovider_openstack_blockstorage_ignore_volume_az | bool | ternary('yes', 'no') }}
+{% if openshift_cloudprovider_openstack_blockstorage_version is defined %}
 bs-version={{ openshift_cloudprovider_openstack_blockstorage_version }}
 {% endif %}