openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Merge "Rename attributes: vncserver_* -> server_*" into stable/queens

This commit is contained in:
Zuul 2018-10-04 22:34:23 +00:00 committed by Gerrit Code Review
parent 6037be201c 50589b0e2a
commit 7f740f982d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.rb
View File

@ -5,7 +5,7 @@ issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_u
source_url 'https://github.com/openstack/cookbook-openstack-compute' if respond_to?(:source_url)
license 'Apache-2.0'
description 'The OpenStack Compute service Nova.'
version '17.0.0'
version '17.0.1'
chef_version '>= 12.5' if respond_to?(:chef_version)
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

4
recipes/nova-common.rb
View File

@ -163,8 +163,8 @@ node.default['openstack']['compute']['conf'].tap do |conf|
conf['vnc']['xvpvncproxy_port'] = xvpvnc_bind['port']
conf['vnc']['novncproxy_host'] = novnc_bind_address
conf['vnc']['novncproxy_port'] = novnc_bind['port']
conf['vnc']['vncserver_listen'] = vnc_bind_address
conf['vnc']['vncserver_proxyclient_address'] = vnc_proxy_bind_address
conf['vnc']['server_listen'] = vnc_bind_address
conf['vnc']['server_proxyclient_address'] = vnc_proxy_bind_address
unless memcache_servers.empty?
# Need to set the backend explicitly, see LP bug #1572062
conf['cache']['backend'] = 'oslo_cache.memcache_pool'

12
spec/nova-common_spec.rb
View File

@ -185,21 +185,21 @@ describe 'openstack-compute::nova-common' do
end
end
it 'has default vncserver_* options set' do
it 'has default server_* options set' do
node.set['openstack']['endpoints']['compute-vnc-bind']['bind_interface'] = 'lo'
[/^vncserver_listen = 127.0.0.1$/,
/^vncserver_proxyclient_address = 127.0.0.1$/].each do |line|
[/^server_listen = 127.0.0.1$/,
/^server_proxyclient_address = 127.0.0.1$/].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end
it 'has override vncserver_* options set' do
it 'has override server_* options set' do
node.set['openstack']['bind_service']['all']['compute-vnc']['host'] = '1.1.1.1'
node.set['openstack']['bind_service']['all']['compute-vnc-proxy']['host'] = '2.2.2.2'
[/^vncserver_listen = 1.1.1.1$/,
/^vncserver_proxyclient_address = 2.2.2.2$/].each do |line|
[/^server_listen = 1.1.1.1$/,
/^server_proxyclient_address = 2.2.2.2$/].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end