openstack
/
puppet-placement
Code Issues Proposed changes

Convert all class usage to relative names 

Change-Id: I9009b69e64a5ec8094fc407df5396062a86f2c78
This commit is contained in:
Tobias Urdin 2019-12-08 23:19:32 +01:00
parent 2de53b9202
commit c9c44c4191
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/init.pp
View File

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

6
manifests/api.pp
View File

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

2
manifests/config.pp
View File

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

4
manifests/db.pp
View File

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

2
manifests/db/mysql.pp
View File

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

2
manifests/db/postgresql.pp
View File

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

2
manifests/db/sync.pp
View File

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

4
manifests/generic_service.pp
View File

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

4
manifests/init.pp
View File

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

2
manifests/keystone/auth.pp
View File

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

2
manifests/keystone/authtoken.pp
View File

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

2
manifests/logging.pp
View File

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

4
manifests/params.pp
View File

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

4
manifests/policy.pp
View File

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

8
manifests/wsgi/apache.pp
View File

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