From 6699289978ba85514293780441395a422a4b88ce Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 18 Feb 2025 02:04:41 +0900 Subject: [PATCH] Stop using absolute names for defined resource types Since Puppet 4, names are always absolute. We already replaced usage of absolute names for class inclusion, so can do the same for defined resource types. Change-Id: I6efcaa1a07781fb2ce7c08f6710be05b52edfc46 --- manifests/compute/libvirt.pp | 4 ++-- manifests/compute/libvirt/qemu.pp | 4 ++-- manifests/db/mysql.pp | 4 ++-- manifests/db/mysql_api.pp | 2 +- manifests/db/postgresql.pp | 4 ++-- manifests/db/postgresql_api.pp | 2 +- manifests/migration/libvirt.pp | 4 ++-- manifests/wsgi/apache_api.pp | 2 +- manifests/wsgi/apache_metadata.pp | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp index 54e45719b..bb79f909a 100644 --- a/manifests/compute/libvirt.pp +++ b/manifests/compute/libvirt.pp @@ -330,12 +330,12 @@ class nova::compute::libvirt ( # - set nova::compute::libvirt::manage_libvirt_services to false # - include nova::compute::libvirt::services in your composition layer # - select which services you want to deploy with - # ::nova::compute::libvirt::services:* parameters. + # $::nova::compute::libvirt::services:* parameters. # # If you're not using hiera: # - set nova::compute::libvirt::manage_libvirt_services to true (default). # - select which services you want to deploy with - # ::nova::compute::libvirt::*_service_name parameters. + # $::nova::compute::libvirt::*_service_name parameters. if $manage_libvirt_services { class { 'nova::compute::libvirt::services': libvirt_service_name => $libvirt_service_name, diff --git a/manifests/compute/libvirt/qemu.pp b/manifests/compute/libvirt/qemu.pp index 12d9384f8..9c9b0aa15 100644 --- a/manifests/compute/libvirt/qemu.pp +++ b/manifests/compute/libvirt/qemu.pp @@ -47,8 +47,8 @@ # # [*libvirt_version*] # (optional) installed libvirt version. Default is automatic detected depending -# of the used OS installed via ::nova::compute::libvirt::version::default . -# Defaults to ::nova::compute::libvirt::version::default +# of the used OS installed via $::nova::compute::libvirt::version::default . +# Defaults to $::nova::compute::libvirt::version::default # class nova::compute::libvirt::qemu( Boolean $configure_qemu = false, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 56e444976..517cd9c71 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -49,7 +49,7 @@ class nova::db::mysql( include nova::deps - ::openstacklib::db::mysql { 'nova': + openstacklib::db::mysql { 'nova': user => $user, password => $password, dbname => $dbname, @@ -61,7 +61,7 @@ class nova::db::mysql( if $setup_cell0 { # need for cell_v2 - ::openstacklib::db::mysql { 'nova_cell0': + openstacklib::db::mysql { 'nova_cell0': user => $user, password => $password, dbname => "${dbname}_cell0", diff --git a/manifests/db/mysql_api.pp b/manifests/db/mysql_api.pp index 0e1886cf9..88287b454 100644 --- a/manifests/db/mysql_api.pp +++ b/manifests/db/mysql_api.pp @@ -43,7 +43,7 @@ class nova::db::mysql_api( include nova::deps - ::openstacklib::db::mysql { 'nova_api': + openstacklib::db::mysql { 'nova_api': user => $user, password => $password, dbname => $dbname, diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 34a52aa8f..8be46281b 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -40,7 +40,7 @@ class nova::db::postgresql( include nova::deps - ::openstacklib::db::postgresql { 'nova': + openstacklib::db::postgresql { 'nova': password => $password, dbname => $dbname, user => $user, @@ -50,7 +50,7 @@ class nova::db::postgresql( if $setup_cell0 { # need for cell_v2 - ::openstacklib::db::postgresql { 'nova_cell0': + openstacklib::db::postgresql { 'nova_cell0': password => $password, dbname => "${dbname}_cell0", user => $user, diff --git a/manifests/db/postgresql_api.pp b/manifests/db/postgresql_api.pp index 32526168e..fda311e89 100644 --- a/manifests/db/postgresql_api.pp +++ b/manifests/db/postgresql_api.pp @@ -34,7 +34,7 @@ class nova::db::postgresql_api( include nova::deps - ::openstacklib::db::postgresql { 'nova_api': + openstacklib::db::postgresql { 'nova_api': password => $password, dbname => $dbname, user => $user, diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp index a40f6c37c..6b963cbe1 100644 --- a/manifests/migration/libvirt.pp +++ b/manifests/migration/libvirt.pp @@ -149,8 +149,8 @@ # # [*libvirt_version*] # (optional) installed libvirt version. Default is automatic detected depending -# of the used OS installed via ::nova::compute::libvirt::version::default . -# Defaults to ::nova::compute::libvirt::version::default +# of the used OS installed via $::nova::compute::libvirt::version::default . +# Defaults to $::nova::compute::libvirt::version::default # # [*modular_libvirt*] # (optional) Whether to enable modular libvirt daemons or use monolithic diff --git a/manifests/wsgi/apache_api.pp b/manifests/wsgi/apache_api.pp index 8f3823c24..60c7ce988 100644 --- a/manifests/wsgi/apache_api.pp +++ b/manifests/wsgi/apache_api.pp @@ -173,7 +173,7 @@ class nova::wsgi::apache_api ( fail('::nova::api class must be declared in composition layer.') } - ::openstacklib::wsgi::apache { 'nova_api_wsgi': + openstacklib::wsgi::apache { 'nova_api_wsgi': bind_host => $bind_host, bind_port => $port, group => $::nova::params::group, diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp index 71cdf02f1..155854cdc 100644 --- a/manifests/wsgi/apache_metadata.pp +++ b/manifests/wsgi/apache_metadata.pp @@ -186,7 +186,7 @@ class nova::wsgi::apache_metadata ( Service <| title == 'httpd' |> { tag +> 'nova-service' } - ::openstacklib::wsgi::apache { 'nova_metadata_wsgi': + openstacklib::wsgi::apache { 'nova_metadata_wsgi': bind_host => $bind_host, bind_port => $port, group => $::nova::params::group,