Browse Source

Merge "Stop converting service name in RHEL/CentOS"

changes/04/824104/1
Zuul 4 months ago committed by Gerrit Code Review
parent
commit
3927d78089
  1. 9
      manifests/api.pp
  2. 6
      releasenotes/notes/use-actual-service_name-on-redhat-follow-up-7a330703f4982dac.yaml

9
manifests/api.pp

@ -467,17 +467,12 @@ class barbican::api (
$service_ensure = 'stopped'
}
if $service_name == 'barbican-api' or $service_name == $::barbican::params::api_service_name {
if $service_name == $::barbican::params::api_service_name {
if $::operatingsystem == 'Ubuntu' {
fail('With Ubuntu packages the service_name must be set to httpd as there is no eventlet init script.')
}
if $::osfamily == 'RedHat' and $service_name == 'barbican-api' {
warning('The usage of barbican-api as service_name in Red Hat based OS is \
deprecated and will be removed in a future release. Use openstack-barbican-api instead.')
}
service { 'barbican-api':
ensure => $service_ensure,
name => $::barbican::params::api_service_name,
@ -512,7 +507,7 @@ deprecated and will be removed in a future release. Use openstack-barbican-api i
Service['barbican-api'] -> Service[$service_name]
}
} else {
fail('Invalid service_name. Use barbican-api for stand-alone or httpd')
fail('Invalid service_name.')
}
}

6
releasenotes/notes/use-actual-service_name-on-redhat-follow-up-7a330703f4982dac.yaml

@ -0,0 +1,6 @@
---
upgrade:
- |
The ``barbican::api::service_name`` no longer accetps ``barbican-api``
as a valid service name in RHEL/CentOS. Use the actual service name,
``openstack-barbican-api`` instead.
Loading…
Cancel
Save