Add glance_ca_certificates_file
This commit adds glance_ca_certificates_file into cinder.conf. It is used for glance client requests. Change-Id: I4449ce8ec67af70463fd2107749a555c634767d8 Closes-Bug: #1389071
This commit is contained in:
parent
30c11ab426
commit
f11cea4608
|
@ -10,6 +10,7 @@ This file is used to list changes made in each version of the openstack-block-st
|
|||
* Add attributes for quota_snapshots, no_snapshot_gb_quota and use_default_quota_class
|
||||
* Add glance_api_insecure and make glance_api_servers to be prefixed with scheme
|
||||
* Add sysfsutils package for storwize/SVC driver
|
||||
* Add glance_ca_certificates_file
|
||||
|
||||
## 10.0.0
|
||||
* Upgrading to Juno
|
||||
|
|
|
@ -61,6 +61,7 @@ Attributes
|
|||
Glance Attributes
|
||||
-----------------
|
||||
* `openstack["block-storage"]["image"]["glance_api_insecure"]` - If True, this indicates that glance-api allows the client to perform insecure SSL(https) requests, this should be the same as the setting in the glance-api service
|
||||
* `openstack["block-storage"]["image"]["glance_ca_certificates_file"]` - Location of ca certificates file to use for glance client requests
|
||||
|
||||
MQ attributes
|
||||
-------------
|
||||
|
|
|
@ -94,6 +94,9 @@ default['openstack']['block-storage']['api']['auth']['insecure'] = false
|
|||
# in the glance-api service.
|
||||
default['openstack']['block-storage']['image']['glance_api_insecure'] = false
|
||||
|
||||
# Location of ca certificates file to use for glance client requests
|
||||
default['openstack']['block-storage']['image']['glance_ca_certificates_file'] = nil
|
||||
|
||||
# Maximum allocatable gigabytes
|
||||
# Should equal total backend storage, default is 10TB
|
||||
default['openstack']['block-storage']['max_gigabytes'] = '10000'
|
||||
|
|
|
@ -275,6 +275,15 @@ describe 'openstack-block-storage::cinder-common' do
|
|||
expect(chef_run).to render_file(file.name).with_content(/^glance_api_insecure=true$/)
|
||||
end
|
||||
|
||||
it 'has a glance_ca_certificates_file attribute' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^glance_ca_certificates_file=$/)
|
||||
end
|
||||
|
||||
it 'sets glance_ca_certificates_file attribute' do
|
||||
node.set['openstack']['block-storage']['image']['glance_ca_certificates_file'] = 'dir/to/path'
|
||||
expect(chef_run).to render_file(file.name).with_content(%r{^glance_ca_certificates_file=dir/to/path$})
|
||||
end
|
||||
|
||||
%w(host port).each do |glance_attr|
|
||||
it "has a glance #{glance_attr} attribute" do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^glance_#{glance_attr}=#{glance_attr}$/)
|
||||
|
|
|
@ -88,6 +88,9 @@ glance_api_servers=<%= @glance_scheme %>://<%= @glance_host %>:<%= @glance_port
|
|||
glance_api_insecure=<%= node['openstack']['block-storage']['image']['glance_api_insecure'] %>
|
||||
#### (BoolOpt) Allow to perform insecure SSL (https) requests to 'glance'
|
||||
|
||||
glance_ca_certificates_file=<%= node['openstack']['block-storage']['image']['glance_ca_certificates_file'] %>
|
||||
#### (StrOpt) Location of ca certificates file to use for glance client requests
|
||||
|
||||
# glance_num_retries=0
|
||||
#### (IntOpt) Number retries when downloading an image from glance
|
||||
|
||||
|
|
Loading…
Reference in New Issue