openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Use anchor instead of specific package resource"

Browse Source
This commit is contained in:
Zuul 2024-04-17 16:54:30 +00:00 committed by Gerrit Code Review
commit b7d9b4031d
18 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/aodh.pp
View File

@ -19,7 +19,7 @@ class openstack_integration::aodh (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'aodh':
notify => Service['httpd'],
require => Package['aodh'],
require => Anchor['aodh::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/barbican.pp
View File

@ -11,7 +11,7 @@ class openstack_integration::barbican {
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'barbican':
notify => Service['httpd'],
require => Package['barbican-api'],
require => Anchor['barbican::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/cinder.pp
View File

@ -36,7 +36,7 @@ class openstack_integration::cinder (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'cinder':
notify => Service['httpd'],
require => Package['cinder'],
require => Anchor['cinder::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/designate.pp
View File

@ -15,7 +15,7 @@ class openstack_integration::designate (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'designate':
notify => Service['httpd'],
require => Package['designate-common'],
require => Anchor['designate::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/gnocchi.pp
View File

@ -14,7 +14,7 @@ class openstack_integration::gnocchi (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'gnocchi':
notify => Service['httpd'],
require => Package['gnocchi'],
require => Anchor['gnocchi::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

19
manifests/heat.pp
View File

@ -18,15 +18,10 @@ class openstack_integration::heat (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'heat':
require => Package['heat-common'],
notify => Service['httpd'],
require => Anchor['heat::install::end'],
}
$key_file = "/etc/heat/ssl/private/${facts['networking']['fqdn']}.pem"
$crt_file = $::openstack_integration::params::cert_path
File[$key_file] ~> Service<| tag == 'heat-service' |>
Exec['update-ca-certificates'] ~> Service<| tag == 'heat-service' |>
} else {
$key_file = undef
$crt_file = undef
Exec['update-ca-certificates'] ~> Service['httpd']
}
class { 'heat::keystone::authtoken':
@ -118,8 +113,8 @@ class openstack_integration::heat (
class { 'heat::wsgi::apache_api':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_cert => $crt_file,
ssl_key => $key_file,
ssl_cert => $::openstack_integration::params::cert_path,
ssl_key => "/etc/heat/ssl/private/${facts['networking']['fqdn']}.pem",
workers => 2,
}
class { 'heat::engine':
@ -134,8 +129,8 @@ class openstack_integration::heat (
class { 'heat::wsgi::apache_api_cfn':
bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl,
ssl_cert => $crt_file,
ssl_key => $key_file,
ssl_cert => $::openstack_integration::params::cert_path,
ssl_key => "/etc/heat/ssl/private/${facts['networking']['fqdn']}.pem",
workers => 2,
}
class { 'heat::cron::purge_deleted': }

4
manifests/ironic.pp
View File

@ -25,11 +25,11 @@ class openstack_integration::ironic (
openstack_integration::ssl_key { 'ironic':
notify => Service['httpd'],
require => Package['ironic-common'],
require => Anchor['ironic::install::end'],
}
openstack_integration::ssl_key { 'ironic-inspector':
notify => Service['httpd'],
require => Package['ironic-inspector'],
require => Anchor['ironic-inspector::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/keystone.pp
View File

@ -33,7 +33,7 @@ class openstack_integration::keystone (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'keystone':
notify => Service['httpd'],
require => Package['keystone'],
require => Anchor['keystone::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/magnum.pp
View File

@ -21,7 +21,7 @@ class openstack_integration::magnum (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'magnum':
notify => Service['httpd'],
require => Package['magnum-common'],
require => Anchor['magnum::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/manila.pp
View File

@ -25,7 +25,7 @@ class openstack_integration::manila (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'manila':
notify => Service['httpd'],
require => Package['manila'],
require => Anchor['manila::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/mistral.pp
View File

@ -10,7 +10,7 @@ class openstack_integration::mistral {
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'mistral':
notify => Service['httpd'],
require => Package['mistral-common'],
require => Anchor['mistral::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/nova.pp
View File

@ -52,7 +52,7 @@ class openstack_integration::nova (
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'nova':
notify => Service['httpd'],
require => Package['nova-common'],
require => Anchor['nova::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/placement.pp
View File

@ -10,7 +10,7 @@ class openstack_integration::placement {
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'placement':
notify => Service['httpd'],
require => Package['placement-common'],
require => Anchor['placement::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/swift.pp
View File

@ -122,7 +122,7 @@ class openstack_integration::swift {
ensure => directory,
owner => 'swift',
group => 'swift',
require => Package['swift'],
require => Anchor['swift::install::end'],
}
# Create 3 directories under /srv/node for 3 devices
[1, 2, 3].each | $device | {

2
manifests/trove.pp
View File

@ -11,7 +11,7 @@ class openstack_integration::trove {
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'trove':
notify => Service['httpd'],
require => Package['trove'],
require => Anchor['trove::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/vitrage.pp
View File

@ -11,7 +11,7 @@ class openstack_integration::vitrage {
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'vitrage':
notify => Service['httpd'],
require => Package['vitrage'],
require => Anchor['vitrage::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/watcher.pp
View File

@ -11,7 +11,7 @@ class openstack_integration::watcher {
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'watcher':
notify => Service['httpd'],
require => Package['watcher'],
require => Anchor['watcher::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}

2
manifests/zaqar.pp
View File

@ -5,7 +5,7 @@ class openstack_integration::zaqar {
if $::openstack_integration::config::ssl {
openstack_integration::ssl_key { 'zaqar':
notify => Service['httpd'],
require => Package['zaqar-common'],
require => Anchor['zaqar::install::end'],
}
Exec['update-ca-certificates'] ~> Service['httpd']
}