Merge "Use raw IP address for apache"
This commit is contained in:
commit
659455bdef
@ -76,7 +76,7 @@ class openstack_integration::aodh (
|
||||
}
|
||||
include 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_key => "/etc/aodh/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -69,7 +69,7 @@ class openstack_integration::barbican {
|
||||
}
|
||||
include 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_key => "/etc/barbican/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -102,7 +102,7 @@ class openstack_integration::cinder (
|
||||
}
|
||||
include 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_key => "/etc/cinder/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -68,7 +68,7 @@ class openstack_integration::designate {
|
||||
}
|
||||
include 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_cert => $::openstack_integration::params::cert_path,
|
||||
ssl => $::openstack_integration::config::ssl,
|
||||
|
@ -79,7 +79,7 @@ class openstack_integration::gnocchi (
|
||||
}
|
||||
include 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_key => "/etc/gnocchi/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -60,7 +60,7 @@ class openstack_integration::ironic {
|
||||
}
|
||||
include 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_key => "/etc/ironic/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -86,7 +86,7 @@ class openstack_integration::keystone (
|
||||
}
|
||||
include 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_key => "/etc/keystone/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -51,7 +51,7 @@ class openstack_integration::mistral {
|
||||
}
|
||||
include 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_key => "/etc/mistral/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -134,14 +134,14 @@ class openstack_integration::nova (
|
||||
}
|
||||
include apache
|
||||
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_cert => $::openstack_integration::params::cert_path,
|
||||
ssl => $::openstack_integration::config::ssl,
|
||||
workers => '2',
|
||||
}
|
||||
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_cert => $::openstack_integration::params::cert_path,
|
||||
ssl => $::openstack_integration::config::ssl,
|
||||
|
@ -136,7 +136,7 @@ class openstack_integration::octavia (
|
||||
}
|
||||
include 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_key => "/etc/octavia/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -46,7 +46,7 @@ class openstack_integration::placement {
|
||||
include apache
|
||||
if ($::operatingsystem != 'Debian') {
|
||||
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_cert => $::openstack_integration::params::cert_path,
|
||||
ssl => $::openstack_integration::config::ssl,
|
||||
|
@ -75,7 +75,7 @@ class openstack_integration::sahara (
|
||||
if $service_name == 'httpd' {
|
||||
include 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_key => "/etc/sahara/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -90,7 +90,7 @@ class openstack_integration::vitrage {
|
||||
}
|
||||
include 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_key => "/etc/vitrage/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -74,7 +74,7 @@ class openstack_integration::watcher {
|
||||
}
|
||||
include 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_key => "/etc/watcher/ssl/private/${::fqdn}.pem",
|
||||
ssl_cert => $::openstack_integration::params::cert_path,
|
||||
|
@ -51,7 +51,7 @@ class openstack_integration::zaqar {
|
||||
}
|
||||
include 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_cert => $::openstack_integration::params::cert_path,
|
||||
ssl_key => "/etc/zaqar/ssl/private/${::fqdn}.pem",
|
||||
|
Loading…
Reference in New Issue
Block a user