openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Refactor ssl_key to simplify horizon manifest"

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

20
manifests/horizon.pp
View File

@ -27,26 +27,10 @@ class openstack_integration::horizon (
include openstack_integration::params include openstack_integration::params
if $::openstack_integration::config::ssl { if $::openstack_integration::config::ssl {
file { '/etc/openstack-dashboard/ssl': openstack_integration::ssl_key { 'openstack-dashboard':
ensure => directory,
owner => 'root',
mode => '0755',
selinux_ignore_defaults => true,
require => Package['horizon'],
}
file { '/etc/openstack-dashboard/ssl/private':
ensure => directory,
owner => 'root',
mode => '0755',
selinux_ignore_defaults => true,
require => File['/etc/openstack-dashboard/ssl'],
before => File["/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem"],
}
openstack_integration::ssl_key { 'horizon':
key_path => "/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem",
key_owner => 'root', key_owner => 'root',
require => File['/etc/openstack-dashboard/ssl/private'],
notify => Service['httpd'], notify => Service['httpd'],
require => Anchor['horizon::install::end'],
} }
Exec['update-ca-certificates'] ~> Service['httpd'] Exec['update-ca-certificates'] ~> Service['httpd']
} }

4
manifests/ssl_key.pp
View File

@ -26,13 +26,13 @@ define openstack_integration::ssl_key(
if $key_path == undef { if $key_path == undef {
file { "/etc/${name}/ssl": file { "/etc/${name}/ssl":
ensure => directory, ensure => directory,
owner => $name, owner => $key_owner,
mode => '0775', mode => '0775',
selinux_ignore_defaults => true, selinux_ignore_defaults => true,
} }
file { "/etc/${name}/ssl/private": file { "/etc/${name}/ssl/private":
ensure => directory, ensure => directory,
owner => $name, owner => $key_owner,
mode => '0755', mode => '0755',
require => File["/etc/${name}/ssl"], require => File["/etc/${name}/ssl"],
selinux_ignore_defaults => true, selinux_ignore_defaults => true,