Remove useless hook

Change-Id: I74903cba1897844fce8d20e1bddae0267d2d1ca0
This commit is contained in:
ZhongShengping 2016-12-08 10:24:19 +08:00
parent 37f0bfaa80
commit 748caaf1f0
9 changed files with 9 additions and 6 deletions

View File

@ -23,6 +23,7 @@
class glare::config (
$glare_config = {},
) {
include ::glare::deps
validate_hash($glare_config)

View File

@ -48,6 +48,7 @@ class glare::db (
$database_retry_interval = $::os_service_default,
$database_max_overflow = $::os_service_default,
) {
include ::glare::deps
validate_re($database_connection,

View File

@ -52,6 +52,7 @@ class glare::db::mysql(
$collate = 'utf8_general_ci',
$allowed_hosts = undef
) {
include ::glare::deps
validate_string($password)
@ -66,8 +67,6 @@ class glare::db::mysql(
allowed_hosts => $allowed_hosts,
}
::Openstacklib::Db::Mysql['glare'] ~> Exec<| title == 'glare-db-sync' |>
Anchor['glare::db::begin']
~> Class['glare::db::mysql']
~> Anchor['glare::db::end']

View File

@ -39,9 +39,8 @@ class glare::db::postgresql(
$encoding = undef,
$privileges = 'ALL',
) {
include ::glare::deps
Class['glare::db::postgresql'] -> Service<| title == 'glare' |>
include ::glare::deps
::openstacklib::db::postgresql { 'glare':
password_hash => postgresql_password($user, $password),
@ -51,7 +50,6 @@ class glare::db::postgresql(
privileges => $privileges,
}
::Openstacklib::Db::Postgresql['glare'] ~> Exec<| title == 'glare-db-sync' |>
Anchor['glare::db::begin']
~> Class['glare::db::postgresql']
~> Anchor['glare::db::end']

View File

@ -12,6 +12,7 @@
class glare::db::sync(
$extra_params = '',
) {
include ::glare::deps
exec { 'glare-db-sync':
@ -26,5 +27,4 @@ class glare::db::sync(
],
notify => Anchor['glare::dbsync::end'],
}
Exec['glare-db-sync'] ~> Service<| title == 'glare' |>
}

View File

@ -115,6 +115,7 @@ class glare (
$allow_anonymous_access = $::os_service_default,
$purge_config = false,
) {
include ::glare::params
include ::glare::db
include ::glare::logging

View File

@ -221,6 +221,7 @@ class glare::keystone::authtoken(
$signing_dir = $::os_service_default,
$token_cache_time = $::os_service_default,
) {
include ::glare::deps
keystone::resource::authtoken { 'glare_config':

View File

@ -112,6 +112,7 @@ class glare::logging(
$instance_uuid_format = $::os_service_default,
$log_date_format = $::os_service_default,
) {
include ::glare::deps
oslo::log { 'glare_config':

View File

@ -27,6 +27,7 @@ class glare::policy (
$policies = {},
$policy_path = '/etc/glare/policy.json',
) {
include ::glare::deps
validate_hash($policies)