diff --git a/manifests/api.pp b/manifests/api.pp index 98d3dad..87677c0 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -40,7 +40,6 @@ class placement::api ( Boolean $sync_db = false, $enable_proxy_headers_parsing = $facts['os_service_default'], ) inherits placement::params { - include placement::deps include placement::policy diff --git a/manifests/client.pp b/manifests/client.pp index 89ffb3a..89573fe 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -8,7 +8,7 @@ # (optional) The state for the placement client package # Defaults to 'present' # -class placement::client( +class placement::client ( $ensure = 'present' ) { include placement::deps @@ -20,5 +20,5 @@ class placement::client( tag => ['openstack', 'openstackclient'], } - include 'openstacklib::openstackclient' + include openstacklib::openstackclient } diff --git a/manifests/config.pp b/manifests/config.pp index 290a0e1..efddc25 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -23,7 +23,6 @@ class placement::config ( Hash $placement_config = {}, ) { - include placement::deps create_resources('placement_config', $placement_config) diff --git a/manifests/cors.pp b/manifests/cors.pp index fafed74..60fdfa3 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -44,7 +44,6 @@ class placement::cors ( $allow_methods = $facts['os_service_default'], $allow_headers = $facts['os_service_default'], ) { - include placement::deps oslo::cors { 'placement_config': diff --git a/manifests/db.pp b/manifests/db.pp index b8273ef..4b6fba5 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -73,7 +73,6 @@ class placement::db ( $database_pool_timeout = $facts['os_service_default'], $mysql_enable_ndb = $facts['os_service_default'], ) { - include placement::deps oslo::db { 'placement_config': diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 056bca1..09275ba 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -33,7 +33,7 @@ # Only used with mysql modules >= 2.2. # Defaults to 'utf8_general_ci' # -class placement::db::mysql( +class placement::db::mysql ( String[1] $password, $dbname = 'placement', $user = 'placement', @@ -42,7 +42,6 @@ class placement::db::mysql( $collate = 'utf8_general_ci', $allowed_hosts = undef ) { - include placement::deps openstacklib::db::mysql { 'placement': @@ -58,5 +57,4 @@ class placement::db::mysql( Anchor['placement::db::begin'] ~> Class['placement::db::mysql'] ~> Anchor['placement::db::end'] - } diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 9e8ec20..e620bf6 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -24,14 +24,13 @@ # (Optional) Privileges given to the database user. # Default to 'ALL' # -class placement::db::postgresql( +class placement::db::postgresql ( $password, $dbname = 'placement', $user = 'placement', $encoding = undef, $privileges = 'ALL', ) { - include placement::deps openstacklib::db::postgresql { 'placement': @@ -45,5 +44,4 @@ class placement::db::postgresql( Anchor['placement::db::begin'] ~> Class['placement::db::postgresql'] ~> Anchor['placement::db::end'] - } diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index ecfea28..dc2dc60 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -7,10 +7,9 @@ # (Optional) Timeout for the execution of the db_sync # Defaults to 300 # -class placement::db::sync( +class placement::db::sync ( $db_sync_timeout = 300, ) { - include placement::deps include placement::params diff --git a/manifests/deps.pp b/manifests/deps.pp index f16b3a3..86a16f4 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -31,5 +31,4 @@ class placement::deps { # Installation or config changes will always restart services. Anchor['placement::install::end'] ~> Anchor['placement::service::begin'] Anchor['placement::config::end'] ~> Anchor['placement::service::begin'] - } diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index 60b73c7..30f9d1f 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -30,14 +30,13 @@ # (Optional) Control the ensure parameter for the package resource. # Defaults to 'present'. # -define placement::generic_service( +define placement::generic_service ( $package_name, $service_name, Boolean $enabled = true, Boolean $manage_service = true, $ensure_package = 'present' ) { - include placement::deps include placement::params diff --git a/manifests/init.pp b/manifests/init.pp index 2853ca5..ad4f758 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -31,7 +31,7 @@ # allocation candidate generation. # Defaults to $facts['os_service_default'] # -class placement( +class placement ( $ensure_package = 'present', Boolean $sync_db = true, $state_path = $facts['os_service_default'], @@ -39,7 +39,6 @@ class placement( $allocation_conflict_retry_count = $facts['os_service_default'], $allocation_candidates_generation_strategy = $facts['os_service_default'], ) inherits placement::params { - include placement::deps if $sync_db { diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 5a7b5d4..0740914 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -102,7 +102,6 @@ class placement::keystone::auth ( Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:8778', Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:8778', ) { - include placement::deps Keystone::Resource::Service_identity['placement'] -> Anchor['placement::service::end'] @@ -128,5 +127,4 @@ class placement::keystone::auth ( internal_url => $internal_url, admin_url => $admin_url, } - } diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 73e8b28..5ccbaf0 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -194,7 +194,7 @@ # (Optional) Hash of additional parameters to pass through to the keystone # authtoken class. Values set here override the individual parameters above. # -class placement::keystone::authtoken( +class placement::keystone::authtoken ( String[1] $password, $username = 'placement', $auth_url = 'http://localhost:5000', @@ -234,7 +234,6 @@ class placement::keystone::authtoken( $interface = $facts['os_service_default'], $params = {}, ) { - include placement::deps keystone::resource::authtoken { diff --git a/manifests/logging.pp b/manifests/logging.pp index d32195c..792701c 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -101,7 +101,7 @@ # Defaults to $facts['os_service_default'] # Example: 'Y-%m-%d %H:%M:%S' # -class placement::logging( +class placement::logging ( $use_syslog = $facts['os_service_default'], $use_json = $facts['os_service_default'], $use_journal = $facts['os_service_default'], @@ -122,7 +122,6 @@ class placement::logging( $instance_uuid_format = $facts['os_service_default'], $log_date_format = $facts['os_service_default'], ) { - include placement::deps oslo::log { 'placement_config': diff --git a/manifests/params.pp b/manifests/params.pp index 15feee1..be6de77 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,8 +1,6 @@ # Parameters for puppet-placement # class placement::params { - - include placement::deps include openstacklib::defaults $pyver3 = $openstacklib::defaults::pyver3 diff --git a/manifests/policy.pp b/manifests/policy.pp index f73d7c8..f0275cd 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -54,7 +54,6 @@ class placement::policy ( $policy_dirs = $facts['os_service_default'], Boolean $purge_config = false, ) { - include placement::deps include placement::params diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index accf16f..0afa0a6 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -158,7 +158,6 @@ class placement::wsgi::apache ( $request_headers = undef, $vhost_custom_fragment = undef, ) { - include placement::deps include placement::params diff --git a/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp index 780e7a5..32e42da 100644 --- a/manifests/wsgi/uwsgi.pp +++ b/manifests/wsgi/uwsgi.pp @@ -25,11 +25,10 @@ class placement::wsgi::uwsgi ( $processes = $facts['os_workers'], $threads = 32, $listen_queue_size = 100, -){ - +) { include placement::deps - if $facts['os']['name'] != 'Debian'{ + if $facts['os']['name'] != 'Debian' { warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.') }