From 02c03ea70431f3643805156d4acf99f136102bd6 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 15 Aug 2022 01:58:58 +0900 Subject: [PATCH] Use raw IP address for apache The latest puppetlabs-apache no longer accepts IPv6 address surrounded by [] as a valid value for $ip. This removes the unnecessary [] to fix the validation failure. Change-Id: I16ba2d81bc0ef85b2abd4b7e4af922ca99e825d5 --- manifests/aodh.pp | 2 +- manifests/barbican.pp | 2 +- manifests/cinder.pp | 2 +- manifests/designate.pp | 2 +- manifests/gnocchi.pp | 2 +- manifests/ironic.pp | 2 +- manifests/keystone.pp | 2 +- manifests/mistral.pp | 2 +- manifests/nova.pp | 4 ++-- manifests/octavia.pp | 2 +- manifests/placement.pp | 2 +- manifests/sahara.pp | 2 +- manifests/vitrage.pp | 2 +- manifests/watcher.pp | 2 +- manifests/zaqar.pp | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifests/aodh.pp b/manifests/aodh.pp index 5fcfae1fd..ee01979f4 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -75,7 +75,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 eceddd7e5..c66463c6e 100644 --- a/manifests/barbican.pp +++ b/manifests/barbican.pp @@ -68,7 +68,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 1abd396cc..f0f993207 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -101,7 +101,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 f603c6602..532a55391 100644 --- a/manifests/designate.pp +++ b/manifests/designate.pp @@ -67,7 +67,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 d8fc0363f..1dc5487cb 100644 --- a/manifests/gnocchi.pp +++ b/manifests/gnocchi.pp @@ -78,7 +78,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 1b1940eda..0a29d6ba3 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -59,7 +59,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 9b95b6066..a0ea64581 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -85,7 +85,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 6c0b30a94..b2d13e0e7 100644 --- a/manifests/mistral.pp +++ b/manifests/mistral.pp @@ -50,7 +50,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 fca3ed54a..f68e3a03c 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -132,14 +132,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 63b890028..fc007dfd1 100644 --- a/manifests/octavia.pp +++ b/manifests/octavia.pp @@ -145,7 +145,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 02b241277..70314869c 100644 --- a/manifests/placement.pp +++ b/manifests/placement.pp @@ -45,7 +45,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 88f140167..8ca79ab74 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -74,7 +74,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 138ada2a6..e820b0f05 100644 --- a/manifests/vitrage.pp +++ b/manifests/vitrage.pp @@ -89,7 +89,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 4e08e9e65..bd83daab4 100644 --- a/manifests/watcher.pp +++ b/manifests/watcher.pp @@ -73,7 +73,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 28c0beed7..b5a2d9d5e 100644 --- a/manifests/zaqar.pp +++ b/manifests/zaqar.pp @@ -50,7 +50,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",