openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Cleanup options deprecated for mitaka 

Some options have been deprecated for Mitaka, replace them with the new
variants.

Change-Id: If4c7ec0348384ba149e18bd865db8d9b2a544555
This commit is contained in:
Jens Rosenboom 2016-04-05 15:18:41 +02:00
parent 90ef0fd54d
commit e7b8e5b6dc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
attributes/nova_conf.rb
View File

@ -14,16 +14,15 @@ default['openstack']['compute']['conf'].tap do |conf|
conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf'
end
conf['DEFAULT']['network_api_class'] = 'nova.network.neutronv2.api.API' # nova.network.api.API
conf['DEFAULT']['use_neutron'] = 'true'
conf['DEFAULT']['linuxnet_interface_driver'] = 'nova.network.linux_net.LinuxOVSInterfaceDriver'
conf['DEFAULT']['firewall_driver'] = 'nova.virt.firewall.NoopFirewallDriver'
conf['DEFAULT']['security_group_api'] = 'neutron'
conf['DEFAULT']['default_floating_pool'] = 'public' # not listed
conf['DEFAULT']['dns_server'] = '8.8.8.8' # [] in docs
# [keystone_authtoken]
conf['keystone_authtoken']['signing_dir'] = '/var/cache/nova/api'
conf['keystone_authtoken']['auth_plugin'] = 'v2password'
conf['keystone_authtoken']['auth_type'] = 'v2password'
conf['keystone_authtoken']['region_name'] = node['openstack']['region']
conf['keystone_authtoken']['username'] = 'nova'
conf['keystone_authtoken']['tenant_name'] = 'service'
@ -45,7 +44,7 @@ default['openstack']['compute']['conf'].tap do |conf|
end
# [neutron]
conf['neutron']['auth_plugin'] = 'v2password'
conf['neutron']['auth_type'] = 'v2password'
conf['neutron']['region_name'] = node['openstack']['region']
conf['neutron']['username'] = 'neutron'
conf['neutron']['tenant_name'] = 'service'

5
recipes/nova-common.rb
View File

@ -143,7 +143,7 @@ Chef::Log.debug("openstack-compute::nova-common:network_endpoint|#{network_endpo
Chef::Log.debug("openstack-compute::nova-common:image_endpoint|#{image_endpoint}")
# Chef::Log.debug("openstack-compute::nova-common:ironic_endpoint|#{ironic_endpoint}")
if node['openstack']['compute']['conf']['neutron']['auth_plugin'] == 'v2password'
if node['openstack']['compute']['conf']['neutron']['auth_type'] == 'v2password'
node.default['openstack']['compute']['conf_secrets']
.[]('neutron')['password'] =
get_password 'service', 'openstack-network'
@ -189,7 +189,8 @@ node.default['openstack']['compute']['conf'].tap do |conf|
conf['vnc']['vncserver_listen'] = vnc_bind_address
conf['vnc']['vncserver_proxyclient_address'] = vnc_proxy_bind_address
unless memcache_servers.empty?
conf['DEFAULT']['memcached_servers'] = memcache_servers
conf['cache']['enabled'] = 'true'
conf['cache']['memcache_servers'] = memcache_servers
end
# [keystone_authtoken] section