Convert all class usage to relative names
Change-Id: I94b269962183ce16d68b0751df0817d7d2b4a4c0
This commit is contained in:
parent
2f5bb44676
commit
db08d0d851
|
@ -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 ::senlin
|
include senlin
|
||||||
|
|
|
@ -12,8 +12,8 @@ class senlin::client (
|
||||||
$ensure = 'present'
|
$ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
include ::senlin::params
|
include senlin::params
|
||||||
|
|
||||||
package { 'python-senlinclient':
|
package { 'python-senlinclient':
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
|
|
|
@ -24,7 +24,7 @@ class senlin::config (
|
||||||
$senlin_config = {},
|
$senlin_config = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $senlin_config)
|
validate_legacy(Hash, 'validate_hash', $senlin_config)
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ class senlin::db (
|
||||||
$database_idle_timeout = undef,
|
$database_idle_timeout = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
if $database_idle_timeout {
|
if $database_idle_timeout {
|
||||||
warning('The database_idle_timeout parameter is deprecated. Please use \
|
warning('The database_idle_timeout parameter is deprecated. Please use \
|
||||||
|
|
|
@ -43,7 +43,7 @@ class senlin::db::mysql(
|
||||||
$allowed_hosts = undef
|
$allowed_hosts = undef
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
validate_legacy(String, 'validate_string', $password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ class senlin::db::postgresql(
|
||||||
$privileges = 'ALL',
|
$privileges = 'ALL',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
::openstacklib::db::postgresql { 'senlin':
|
::openstacklib::db::postgresql { 'senlin':
|
||||||
password_hash => postgresql_password($user, $password),
|
password_hash => postgresql_password($user, $password),
|
||||||
|
|
|
@ -12,7 +12,7 @@ class senlin::db::sync(
|
||||||
$extra_params = undef,
|
$extra_params = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
exec { 'senlin-db-sync':
|
exec { 'senlin-db-sync':
|
||||||
command => "senlin-manage db_sync ${extra_params}",
|
command => "senlin-manage db_sync ${extra_params}",
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#
|
#
|
||||||
class senlin {
|
class senlin {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
include ::senlin::params
|
include senlin::params
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,7 @@ class senlin::keystone::auth (
|
||||||
$internal_url = 'http://127.0.0.1:8778',
|
$internal_url = 'http://127.0.0.1:8778',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
if $configure_user_role {
|
if $configure_user_role {
|
||||||
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'senlin-server' |>
|
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'senlin-server' |>
|
||||||
|
|
|
@ -202,7 +202,7 @@ class senlin::keystone::authtoken(
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
keystone::resource::authtoken { 'senlin_config':
|
keystone::resource::authtoken { 'senlin_config':
|
||||||
username => $username,
|
username => $username,
|
||||||
|
|
|
@ -123,7 +123,7 @@ class senlin::logging(
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
|
|
||||||
oslo::log { 'senlin_config':
|
oslo::log { 'senlin_config':
|
||||||
use_stderr => $use_stderr,
|
use_stderr => $use_stderr,
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
#
|
#
|
||||||
class senlin::params {
|
class senlin::params {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
include ::openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::pyvers
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
|
|
||||||
$client_package_name = "python${pyvers}-senlinclient"
|
$client_package_name = "python${pyvers}-senlinclient"
|
||||||
|
|
|
@ -28,8 +28,8 @@ class senlin::policy (
|
||||||
$policy_path = '/etc/senlin/policy.json',
|
$policy_path = '/etc/senlin/policy.json',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::senlin::deps
|
include senlin::deps
|
||||||
include ::senlin::params
|
include senlin::params
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $policies)
|
validate_legacy(Hash, 'validate_hash', $policies)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue