Correct the wrong configuration about glance_protocol
Change-Id: If736210aaac0436119ac6c4ea880d056f086090c Closes-bug: #1444892
This commit is contained in:
parent
45c192fb20
commit
5cc49f6b91
|
@ -60,17 +60,25 @@ describe 'openstack-bare-metal::ironic-common' do
|
||||||
)
|
)
|
||||||
end
|
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
|
context 'template contents' do
|
||||||
it 'has the default rpc_backend attribute' do
|
it 'has the default rpc_backend attribute' do
|
||||||
expect(chef_run).to render_config_file(file.name)\
|
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^rpc_backend=rabbit$/)
|
||||||
.with_section_content('DEFAULT', /^rpc_backend=rabbit$/)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'overrides the default rpc_backend attribute' do
|
it 'overrides the default rpc_backend attribute' do
|
||||||
node.set['openstack']['bare-metal']['rpc_backend'] = 'qpid'
|
node.set['openstack']['bare-metal']['rpc_backend'] = 'qpid'
|
||||||
|
|
||||||
expect(chef_run).to render_config_file(file.name)\
|
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^rpc_backend=qpid$/)
|
||||||
.with_section_content('DEFAULT', /^rpc_backend=qpid$/)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'sets the default auth attributes' do
|
it 'sets the default auth attributes' do
|
||||||
|
|
|
@ -857,7 +857,7 @@ glance_port=<%= @glance_port %>
|
||||||
|
|
||||||
# Default protocol to use when connecting to glance. Set to
|
# Default protocol to use when connecting to glance. Set to
|
||||||
# https for SSL. (string value)
|
# https for SSL. (string value)
|
||||||
glance_protocol=<%= @glance_scheme %>
|
glance_protocol=<%= @glance_protocol %>
|
||||||
|
|
||||||
# A list of the glance api servers available to ironic. Prefix
|
# A list of the glance api servers available to ironic. Prefix
|
||||||
# with https:// for SSL-based glance API servers. Format is
|
# with https:// for SSL-based glance API servers. Format is
|
||||||
|
|
Loading…
Reference in New Issue