openstack/puppet-neutron
Code Issues Proposed changes

Revert "Use consistent path pattern for lock_path"

Browse Source 
This reverts commit 1ad35d2790f17f293463131d137f963475733613.

Reason for revert:
$state_path/lock is the path used in neutron installed using RDO
packages by default. Also usage of /var/lock/neutron breaks ml2-ovn,
because neutron can't access to the directory and get Permission
Error.

Change-Id: I31f0b2bab7d1d7ba58a79662598ee18f756c0600
This commit is contained in:
Takashi Kajinami 2024-09-21 14:45:42 +09:00
parent 3a974aa691
commit f3e88e7091
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/init.pp
View File

@ -240,7 +240,7 @@
# [*lock_path*]
# (optional) Where to store lock files. This directory must be writeable
# by the user executing the agent
# Defaults to: $::neutron::params::lock_path
# Defaults to: '$state_path/lock'
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -320,16 +320,17 @@ class neutron (
$key_file = $facts['os_service_default'],
$ca_file = $facts['os_service_default'],
$state_path = $facts['os_service_default'],
$lock_path = $::neutron::params::lock_path,
$lock_path = '$state_path/lock',
Boolean $purge_config = false,
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'],
$max_allowed_address_pair = $facts['os_service_default'],
$vlan_transparent = $facts['os_service_default'],
) inherits neutron::params {
) {
include neutron::deps
include neutron::params
if ! is_service_default($use_ssl) and ($use_ssl) {
if is_service_default($cert_file) {

2
manifests/params.pp
View File

@ -25,7 +25,6 @@ class neutron::params {
case $facts['os']['family'] {
'RedHat': {
$lock_path = '/var/lib/neutron/tmp'
$package_name = 'openstack-neutron'
$server_service = 'neutron-server'
$server_package = undef
@ -71,7 +70,6 @@ class neutron::params {
$networking_baremetal_agent_service = 'ironic-neutron-agent'
}
'Debian': {
$lock_path = '/var/lock/neutron'
$package_name = 'neutron-common'
if $facts['os']['name'] == 'Debian' {
$ml2_server_package = undef

8
spec/classes/neutron_init_spec.rb
View File

@ -114,7 +114,7 @@ describe 'neutron' do
should contain_neutron_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/state_path').with_value('<SERVICE DEFAULT>')
should contain_oslo__concurrency('neutron_config').with(
:lock_path => platform_params[:lock_path]
:lock_path => '$state_path/lock'
)
should contain_oslo__messaging__default('neutron_config').with(
:executor_thread_pool_size => '<SERVICE DEFAULT>',
@ -445,13 +445,11 @@ describe 'neutron' do
case facts[:os]['family']
when 'Debian'
{
:common_package_name => 'neutron-common',
:lock_path => '/var/lock/neutron'
:common_package_name => 'neutron-common'
}
when 'RedHat'
{
:common_package_name => 'openstack-neutron',
:lock_path => '/var/lib/neutron/tmp'
:common_package_name => 'openstack-neutron'
}
end
end