- Cookstyle fixes - Refactor Berksfile to use groups so we can exclude integration testing cookbooks - Update documentation - Cleanup line wraps - Enable sensitive resources for the template[/etc/neutron/neutron.conf] and template[/etc/neutron/metadata_agent.ini] to resources improve security. - Update delivery configuration to exclude integration cookbooks - Fix ChefSpec output. - Update lbaas recipe to use v2 agent driver. - Add recommended configuration settings to neutron.conf based in Stein installation docs. - Remove any resources that define the default action. - Switch package installations to send packages as arrays instead of individual package resources. This generally speeds up chef runs. - Manage /etc/neutron/neutron_lbaas.conf so we can set service_provider properly. - Add some missing ChefSpec tests. - Configure neutron_lbaas.conf on Ubuntu in a manner that allows it to properly pull in the configuration via the --config-dir option. This is due to the fact we need to set an additional [service_providers] service_provider line and we can't do that with hashes. - Remove FWaaS as it's unmaintained upstream. Depends-On: https://review.opendev.org/701027 Depends-On: https://review.opendev.org/706151 Change-Id: Id29884766440d37fa18fd62f3f93eecc22224d51
50 lines
1.9 KiB
Ruby
50 lines
1.9 KiB
Ruby
# attribute can be used in wrapper cookbooks to handover secrets (will not be
|
|
# saved after successfull chef run)
|
|
default['openstack']['network']['conf_secrets'] = {}
|
|
|
|
default['openstack']['network']['conf'].tap do |conf|
|
|
# [DEFAULT] section
|
|
if node['openstack']['network']['syslog']['use']
|
|
conf['DEFAULT']['log_config_append'] = '/etc/openstack/logging.conf'
|
|
else
|
|
conf['DEFAULT']['log_dir'] = '/var/log/neutron'
|
|
end
|
|
conf['DEFAULT']['control_exchange'] = 'neutron'
|
|
conf['DEFAULT']['core_plugin'] = 'ml2'
|
|
if node['openstack']['network_lbaas']['enabled']
|
|
conf['DEFAULT']['service_plugins'] =
|
|
if conf['DEFAULT']['service_plugins'].empty?
|
|
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
|
|
else
|
|
[
|
|
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2',
|
|
conf['DEFAULT']['service_plugins'],
|
|
].flatten.sort.join(',')
|
|
end
|
|
end
|
|
|
|
# [agent] section
|
|
if node['openstack']['network']['use_rootwrap']
|
|
conf['agent']['root_helper'] = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf'
|
|
end
|
|
|
|
# [keystone_authtoken] section
|
|
conf['keystone_authtoken']['auth_type'] = 'password'
|
|
conf['keystone_authtoken']['region_name'] = node['openstack']['region']
|
|
conf['keystone_authtoken']['username'] = 'neutron'
|
|
conf['keystone_authtoken']['user_domain_name'] = 'Default'
|
|
conf['keystone_authtoken']['project_domain_name'] = 'Default'
|
|
conf['keystone_authtoken']['project_name'] = 'service'
|
|
conf['keystone_authtoken']['auth_version'] = 'v3'
|
|
# [nova] section
|
|
conf['nova']['auth_type'] = 'password'
|
|
conf['nova']['region_name'] = node['openstack']['region']
|
|
conf['nova']['username'] = 'nova'
|
|
conf['nova']['user_domain_name'] = 'Default'
|
|
conf['nova']['project_name'] = 'service'
|
|
conf['nova']['project_domain_name'] = 'Default'
|
|
|
|
# [oslo_concurrency] section
|
|
conf['oslo_concurrency']['lock_path'] = '/var/lib/neutron/lock'
|
|
end
|