Browse Source

Convert all class usage to relative names

Change-Id: I9009b69e64a5ec8094fc407df5396062a86f2c78
changes/22/697922/1
Tobias Urdin 2 years ago
parent
commit
c9c44c4191
  1. 2
      examples/init.pp
  2. 6
      manifests/api.pp
  3. 2
      manifests/config.pp
  4. 4
      manifests/db.pp
  5. 2
      manifests/db/mysql.pp
  6. 2
      manifests/db/postgresql.pp
  7. 2
      manifests/db/sync.pp
  8. 4
      manifests/generic_service.pp
  9. 4
      manifests/init.pp
  10. 2
      manifests/keystone/auth.pp
  11. 2
      manifests/keystone/authtoken.pp
  12. 2
      manifests/logging.pp
  13. 4
      manifests/params.pp
  14. 4
      manifests/policy.pp
  15. 8
      manifests/wsgi/apache.pp

2
examples/init.pp

@ -9,4 +9,4 @@
# Learn more about module testing here:
# https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module
#
include ::placement
include placement

6
manifests/api.pp

@ -45,7 +45,7 @@ class placement::api (
$sync_db = false,
) inherits placement::params {
include ::placement::deps
include placement::deps
package { 'placement-api':
ensure => $package_ensure,
@ -69,7 +69,7 @@ class placement::api (
tag => ['placement-service', 'placement-db-sync-service'],
}
} elsif $api_service_name == 'httpd' {
include ::apache::params
include apache::params
service { 'placement-api':
ensure => 'stopped',
name => $::placement::params::service_name,
@ -81,6 +81,6 @@ class placement::api (
}
}
if $sync_db {
include ::placement::db::sync
include placement::db::sync
}
}

2
manifests/config.pp

@ -81,7 +81,7 @@ class placement::config(
$username = undef,
) {
include ::placement::deps
include placement::deps
# TODO(tobias-urdin): Remove these deprecated ones in U release.
$default_parameters = {

4
manifests/db.pp

@ -63,8 +63,8 @@ class placement::db (
$database_pool_timeout = $::os_service_default,
) {
include ::placement::deps
include ::placement::config
include placement::deps
include placement::config
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])

2
manifests/db/mysql.pp

@ -43,7 +43,7 @@ class placement::db::mysql(
$allowed_hosts = undef
) {
include ::placement::deps
include placement::deps
validate_legacy(String, 'validate_string', $password)

2
manifests/db/postgresql.pp

@ -32,7 +32,7 @@ class placement::db::postgresql(
$privileges = 'ALL',
) {
include ::placement::deps
include placement::deps
::openstacklib::db::postgresql { 'placement':
password_hash => postgresql_password($user, $password),

2
manifests/db/sync.pp

@ -3,7 +3,7 @@
#
class placement::db::sync {
include ::placement::deps
include placement::deps
exec { 'placement-manage-db-sync':
command => 'placement-manage db sync',

4
manifests/generic_service.pp

@ -38,8 +38,8 @@ define placement::generic_service(
$ensure_package = 'present'
) {
include ::placement::deps
include ::placement::params
include placement::deps
include placement::params
$placement_title = "placement-${name}"

4
manifests/init.pp

@ -23,10 +23,10 @@ class placement(
$randomize_allocation_candidates = $::os_service_default,
) inherits placement::params {
include ::placement::deps
include placement::deps
if $sync_db {
include ::placement::db::sync
include placement::db::sync
}
package { 'python-placement':

2
manifests/keystone/auth.pp

@ -83,7 +83,7 @@ class placement::keystone::auth (
$internal_url = 'http://127.0.0.1/placement',
) {
include ::placement::deps
include placement::deps
if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'placement-server' |>

2
manifests/keystone/authtoken.pp

@ -220,7 +220,7 @@ class placement::keystone::authtoken(
$interface = $::os_service_default,
) {
include ::placement::deps
include placement::deps
if is_service_default($password) {
fail('Please set password for Placement service user')

2
manifests/logging.pp

@ -123,7 +123,7 @@ class placement::logging(
$log_date_format = $::os_service_default,
) {
include ::placement::deps
include placement::deps
oslo::log { 'placement_config':
use_stderr => $use_stderr,

4
manifests/params.pp

@ -2,8 +2,8 @@
#
class placement::params {
include ::placement::deps
include ::openstacklib::defaults
include placement::deps
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$pyvers_real = $pyvers ? {

4
manifests/policy.pp

@ -28,8 +28,8 @@ class placement::policy (
$policy_path = '/etc/placement/policy.json',
) {
include ::placement::deps
include ::placement::params
include placement::deps
include placement::params
validate_legacy(Hash, 'validate_hash', $policies)

8
manifests/wsgi/apache.pp

@ -113,11 +113,11 @@ class placement::wsgi::apache (
$error_log_file = undef,
) {
include ::placement::params
include ::apache
include ::apache::mod::wsgi
include placement::params
include apache
include apache::mod::wsgi
if $ssl {
include ::apache::mod::ssl
include apache::mod::ssl
}
placement::generic_service { 'api':

Loading…
Cancel
Save