From 6d78224bdb67be7fe1752525c356c5e4d4edcbe2 Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Thu, 27 Sep 2018 15:49:28 +0200 Subject: [PATCH] Rename attributes: vncserver_* -> server_* Source: * openstack/nova git repo: conf: Rename two VNC options Change-Id: Ic05c2c8364e015f6878b0bc25449216624568ad5 commit e5a03e3c54d57aa29bd8154c9eddf7ee52c6c3b5 Change-Id: I3953195b1f8c7f166b89c7ea7ce7994bcd3c0461 --- recipes/nova-common.rb | 4 ++-- spec/nova-common_spec.rb | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb index fc134e4f..c80f0fd9 100644 --- a/recipes/nova-common.rb +++ b/recipes/nova-common.rb @@ -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' diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb index 90200ed7..0e56ea91 100644 --- a/spec/nova-common_spec.rb +++ b/spec/nova-common_spec.rb @@ -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.override['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.override['openstack']['bind_service']['all']['compute-vnc']['host'] = '1.1.1.1' node.override['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