openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Use raw IP address for apache"

Browse Source
This commit is contained in:
Zuul 2022-08-15 16:00:37 +00:00 committed by Gerrit Code Review
commit 659455bdef
15 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/aodh.pp
View File

@ -76,7 +76,7 @@ class openstack_integration::aodh (
} }
include apache include apache
class { 'aodh::wsgi::apache': class { 'aodh::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/aodh/ssl/private/${::fqdn}.pem", ssl_key => "/etc/aodh/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/barbican.pp
View File

@ -69,7 +69,7 @@ class openstack_integration::barbican {
} }
include apache include apache
class { 'barbican::wsgi::apache': class { 'barbican::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/barbican/ssl/private/${::fqdn}.pem", ssl_key => "/etc/barbican/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/cinder.pp
View File

@ -102,7 +102,7 @@ class openstack_integration::cinder (
} }
include apache include apache
class { 'cinder::wsgi::apache': class { 'cinder::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/cinder/ssl/private/${::fqdn}.pem", ssl_key => "/etc/cinder/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/designate.pp
View File

@ -68,7 +68,7 @@ class openstack_integration::designate {
} }
include apache include apache
class { 'designate::wsgi::apache': class { 'designate::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/designate/ssl/private/${::fqdn}.pem", ssl_key => "/etc/designate/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,

2
manifests/gnocchi.pp
View File

@ -79,7 +79,7 @@ class openstack_integration::gnocchi (
} }
include apache include apache
class { 'gnocchi::wsgi::apache': class { 'gnocchi::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/gnocchi/ssl/private/${::fqdn}.pem", ssl_key => "/etc/gnocchi/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/ironic.pp
View File

@ -60,7 +60,7 @@ class openstack_integration::ironic {
} }
include apache include apache
class { 'ironic::wsgi::apache': class { 'ironic::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/ironic/ssl/private/${::fqdn}.pem", ssl_key => "/etc/ironic/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/keystone.pp
View File

@ -86,7 +86,7 @@ class openstack_integration::keystone (
} }
include apache include apache
class { 'keystone::wsgi::apache': class { 'keystone::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/keystone/ssl/private/${::fqdn}.pem", ssl_key => "/etc/keystone/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/mistral.pp
View File

@ -51,7 +51,7 @@ class openstack_integration::mistral {
} }
include apache include apache
class { 'mistral::wsgi::apache': class { 'mistral::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/mistral/ssl/private/${::fqdn}.pem", ssl_key => "/etc/mistral/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

4
manifests/nova.pp
View File

@ -134,14 +134,14 @@ class openstack_integration::nova (
} }
include apache include apache
class { 'nova::wsgi::apache_api': class { 'nova::wsgi::apache_api':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem", ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
workers => '2', workers => '2',
} }
class { 'nova::wsgi::apache_metadata': class { 'nova::wsgi::apache_metadata':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem", ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,

2
manifests/octavia.pp
View File

@ -136,7 +136,7 @@ class openstack_integration::octavia (
} }
include apache include apache
class { 'octavia::wsgi::apache': class { 'octavia::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/octavia/ssl/private/${::fqdn}.pem", ssl_key => "/etc/octavia/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/placement.pp
View File

@ -46,7 +46,7 @@ class openstack_integration::placement {
include apache include apache
if ($::operatingsystem != 'Debian') { if ($::operatingsystem != 'Debian') {
class { 'placement::wsgi::apache': class { 'placement::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl_key => "/etc/placement/ssl/private/${::fqdn}.pem", ssl_key => "/etc/placement/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,

2
manifests/sahara.pp
View File

@ -75,7 +75,7 @@ class openstack_integration::sahara (
if $service_name == 'httpd' { if $service_name == 'httpd' {
include apache include apache
class { 'sahara::wsgi::apache': class { 'sahara::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/sahara/ssl/private/${::fqdn}.pem", ssl_key => "/etc/sahara/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/vitrage.pp
View File

@ -90,7 +90,7 @@ class openstack_integration::vitrage {
} }
include apache include apache
class { 'vitrage::wsgi::apache': class { 'vitrage::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/vitrage/ssl/private/${::fqdn}.pem", ssl_key => "/etc/vitrage/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/watcher.pp
View File

@ -74,7 +74,7 @@ class openstack_integration::watcher {
} }
include apache include apache
class { 'watcher::wsgi::apache': class { 'watcher::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_key => "/etc/watcher/ssl/private/${::fqdn}.pem", ssl_key => "/etc/watcher/ssl/private/${::fqdn}.pem",
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,

2
manifests/zaqar.pp
View File

@ -51,7 +51,7 @@ class openstack_integration::zaqar {
} }
include apache include apache
class { 'zaqar::wsgi::apache': class { 'zaqar::wsgi::apache':
bind_host => $::openstack_integration::config::ip_for_url, bind_host => $::openstack_integration::config::host,
ssl => $::openstack_integration::config::ssl, ssl => $::openstack_integration::config::ssl,
ssl_cert => $::openstack_integration::params::cert_path, ssl_cert => $::openstack_integration::params::cert_path,
ssl_key => "/etc/zaqar/ssl/private/${::fqdn}.pem", ssl_key => "/etc/zaqar/ssl/private/${::fqdn}.pem",