소스 검색

Allow to configure BlockStorage.ignore-volume-az for Openstack Cloud Provider

Alberto Rodriguez Peon 6 년 전
부모
커밋
2d04be1e8a
2개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      roles/openshift_cloud_provider/defaults/main.yml
  2. 2 1
      roles/openshift_cloud_provider/templates/openstack.conf.j2

+ 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: "no"

+ 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 }}
+{% if openshift_cloudprovider_openstack_blockstorage_version is defined %}
 bs-version={{ openshift_cloudprovider_openstack_blockstorage_version }}
 {% endif %}