openstack/puppet-ironic
Code Issues Proposed changes

Refactor api service management

Browse Source 
Drop validation of service name which is not implemented for
the other daemons, to simplify handling of the provided service name.

This allows us to more easily offload the service name definition to
hiera data in the near future.

Change-Id: I14417328d26b48eb4484d1a1b368f6417fb8211a
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-27 14:54:01 +09:00
parent 737cb0c22c
commit b7bc135bc0
2 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
manifests/api.pp
View File

@@ -77,7 +77,7 @@ class ironic::api (
Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $manage_service = true,
Boolean $enabled = true,
$service_name = $ironic::params::api_service,
String[1] $service_name = $ironic::params::api_service,
$host_ip = $facts['os_service_default'],
$port = $facts['os_service_default'],
$max_limit = $facts['os_service_default'],
@@ -108,37 +108,37 @@ class ironic::api (
}
if $manage_service {
if $enabled {
$ensure = 'running'
} else {
$ensure = 'stopped'
}
case $service_name {
'httpd': {
Service <| title == 'httpd' |> { tag +> 'ironic-service' }
if $service_name == $ironic::params::api_service {
service { 'ironic-api':
ensure => $ensure,
name => $ironic::params::api_service,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'ironic-service',
}
Keystone_endpoint<||> -> Service['ironic-api']
Ironic_api_uwsgi_config<||> ~> Service['ironic-api']
} elsif $service_name == 'httpd' {
service { 'ironic-api':
ensure => 'stopped',
name => $ironic::params::api_service,
enable => false,
tag => 'ironic-service',
}
Service <| title == 'httpd' |> { tag +> 'ironic-service' }
service { 'ironic-api':
ensure => 'stopped',
name => $ironic::params::api_service,
enable => false,
tag => 'ironic-service',
}
# we need to make sure ironic-api/eventlet is stopped before trying to start apache
Service['ironic-api'] -> Service[$service_name]
} else {
fail("Invalid service_name. Either ironic-api/openstack-ironic-api for running as a \
standalone service, or httpd for being run by a httpd server")
# we need to make sure ironic-api/eventlet is stopped before trying to start apache
Service['ironic-api'] -> Service['httpd']
}
default: {
$service_ensure = $enabled ? {
true => 'running',
default => 'stopped',
}
service { 'ironic-api':
ensure => $service_ensure,
name => $service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => 'ironic-service',
}
Keystone_endpoint<||> -> Service['ironic-api']
Ironic_api_uwsgi_config<||> ~> Service['ironic-api']
}
}
}

15
spec/classes/ironic_api_spec.rb
View File

@@ -132,21 +132,6 @@ describe 'ironic::api' do
)
end
end
context 'when service_name is not valid' do
before do
params.merge!({ :service_name => 'foobar' })
end
let :pre_condition do
"class { 'ironic::api::authtoken':
password => 'password',
}
include apache"
end
it_raises 'a Puppet::Error', /Invalid service_name/
end
end
on_supported_os({