diff --git a/manifests/aodh.pp b/manifests/aodh.pp index 90f62cb5a..3749b5c16 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -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, diff --git a/manifests/barbican.pp b/manifests/barbican.pp index aa8286c84..0641e4ede 100644 --- a/manifests/barbican.pp +++ b/manifests/barbican.pp @@ -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, diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 02b4d584a..b8690e2b6 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -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, diff --git a/manifests/designate.pp b/manifests/designate.pp index ffa60cdb8..5ecac0f41 100644 --- a/manifests/designate.pp +++ b/manifests/designate.pp @@ -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, diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp index 9a22a88e5..9d5427f8e 100644 --- a/manifests/gnocchi.pp +++ b/manifests/gnocchi.pp @@ -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, diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 6b5e9f3d8..316c17aa4 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -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, diff --git a/manifests/keystone.pp b/manifests/keystone.pp index 7bbbbb39e..395ff5f70 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -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, diff --git a/manifests/mistral.pp b/manifests/mistral.pp index 31f070df6..f65dc0ea8 100644 --- a/manifests/mistral.pp +++ b/manifests/mistral.pp @@ -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, diff --git a/manifests/nova.pp b/manifests/nova.pp index 07b8c6cac..f59fc546f 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -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, diff --git a/manifests/octavia.pp b/manifests/octavia.pp index ad37241fd..edd775f24 100644 --- a/manifests/octavia.pp +++ b/manifests/octavia.pp @@ -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, diff --git a/manifests/placement.pp b/manifests/placement.pp index db9f246e4..68ee2ff2f 100644 --- a/manifests/placement.pp +++ b/manifests/placement.pp @@ -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, diff --git a/manifests/sahara.pp b/manifests/sahara.pp index 60aa49789..a54287db3 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -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, diff --git a/manifests/vitrage.pp b/manifests/vitrage.pp index d4d631ae0..df9e703b4 100644 --- a/manifests/vitrage.pp +++ b/manifests/vitrage.pp @@ -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, diff --git a/manifests/watcher.pp b/manifests/watcher.pp index e07849273..03f4a80af 100644 --- a/manifests/watcher.pp +++ b/manifests/watcher.pp @@ -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, diff --git a/manifests/zaqar.pp b/manifests/zaqar.pp index 7aff21690..c84ba5cb0 100644 --- a/manifests/zaqar.pp +++ b/manifests/zaqar.pp @@ -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",