Correct the wrong configuration about glance_protocol

Change-Id: If736210aaac0436119ac6c4ea880d056f086090c
Closes-bug: #1444892
This commit is contained in:
wenchma 2015-04-16 17:23:07 +08:00
parent 45c192fb20
commit 5cc49f6b91
2 changed files with 13 additions and 5 deletions

View File

@ -60,17 +60,25 @@ describe 'openstack-bare-metal::ironic-common' do
)
end
it 'has the default glance attributes' do
[
/^glance_host=127.0.0.1$/,
/^glance_port=9292$/,
/^glance_protocol=http$/
].each do |line|
expect(chef_run).to render_config_file(file.name).with_section_content('glance', line)
end
end
context 'template contents' do
it 'has the default rpc_backend attribute' do
expect(chef_run).to render_config_file(file.name)\
.with_section_content('DEFAULT', /^rpc_backend=rabbit$/)
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^rpc_backend=rabbit$/)
end
it 'overrides the default rpc_backend attribute' do
node.set['openstack']['bare-metal']['rpc_backend'] = 'qpid'
expect(chef_run).to render_config_file(file.name)\
.with_section_content('DEFAULT', /^rpc_backend=qpid$/)
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^rpc_backend=qpid$/)
end
it 'sets the default auth attributes' do

View File

@ -857,7 +857,7 @@ glance_port=<%= @glance_port %>
# Default protocol to use when connecting to glance. Set to
# https for SSL. (string value)
glance_protocol=<%= @glance_scheme %>
glance_protocol=<%= @glance_protocol %>
# A list of the glance api servers available to ironic. Prefix
# with https:// for SSL-based glance API servers. Format is