Convert all class usage to relative names

Change-Id: I302e05168aea544b21b37882d39c598a70b4b9ef
This commit is contained in:
Tobias Urdin 2019-12-08 23:19:12 +01:00
parent 8affcd34ff
commit 8eb1be1f1b
18 changed files with 42 additions and 42 deletions

View File

@ -1,16 +1,16 @@
class { '::panko': }
class { '::panko::keystone::authtoken':
class { 'panko': }
class { 'panko::keystone::authtoken':
password => 'a_big_secret',
}
class { '::panko::api':
class { 'panko::api':
enabled => true,
service_name => 'httpd',
}
include ::apache
class { '::panko::wsgi::apache':
include apache
class { 'panko::wsgi::apache':
ssl => false,
}
class { '::panko::auth':
class { 'panko::auth':
auth_password => 'a_big_secret',
}

View File

@ -102,8 +102,8 @@ class panko::api (
warning('This Class is deprecated and will be removed in future releases.')
include ::panko::deps
include ::panko::policy
include panko::deps
include panko::policy
package { 'panko-api':
ensure => $package_ensure,
@ -120,7 +120,7 @@ class panko::api (
}
if $sync_db {
include ::panko::db::sync
include panko::db::sync
}
if $service_name == $::panko::params::api_service_name {
@ -133,7 +133,7 @@ class panko::api (
tag => ['panko-service', 'panko-db-sync-service'],
}
} elsif $service_name == 'httpd' {
include ::apache::params
include apache::params
service { 'panko-api':
ensure => 'stopped',
name => $::panko::params::api_service_name,
@ -165,7 +165,7 @@ running as a standalone service, or httpd for being run by a httpd server")
}
if $auth_strategy == 'keystone' {
include ::panko::keystone::authtoken
include panko::keystone::authtoken
panko_api_paste_ini {
'pipeline:main/pipeline': value => 'panko+auth',
}

View File

@ -12,8 +12,8 @@ class panko::client (
$ensure = 'present'
) {
include ::panko::deps
include ::panko::params
include panko::deps
include panko::params
package { 'python-pankoclient':
ensure => $ensure,

View File

@ -28,7 +28,7 @@ class panko::config (
$panko_api_paste_ini = {},
) {
include ::panko::deps
include panko::deps
validate_legacy(Hash, 'validate_hash', $panko_config)
validate_legacy(Hash, 'validate_hash', $panko_api_paste_ini)

View File

@ -62,7 +62,7 @@ class panko::db (
$database_idle_timeout = undef,
) {
include ::panko::deps
include panko::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \

View File

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

View File

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

View File

@ -12,7 +12,7 @@ class panko::db::sync(
$extra_params = undef,
) {
include ::panko::deps
include panko::deps
exec { 'panko-db-sync':
command => "panko-dbsync --config-file /etc/panko/panko.conf ${extra_params}",

View File

@ -34,8 +34,8 @@ class panko::expirer (
$weekday = '*',
) {
include ::panko::params
include ::panko::deps
include panko::params
include panko::deps
Anchor['panko::install::end'] ~> Class['panko::expirer']

View File

@ -18,7 +18,7 @@ class panko (
$purge_config = false,
) inherits panko::params {
include ::panko::deps
include panko::deps
package { 'panko':
ensure => $package_ensure,

View File

@ -87,7 +87,7 @@ class panko::keystone::auth (
$internal_url = 'http://127.0.0.1:8977',
) {
include ::panko::deps
include panko::deps
keystone::resource::service_identity { 'panko':
configure_user => $configure_user,

View File

@ -218,7 +218,7 @@ class panko::keystone::authtoken(
$service_token_roles_required = $::os_service_default,
) {
include ::panko::deps
include panko::deps
keystone::resource::authtoken { 'panko_config':
username => $username,

View File

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

View File

@ -1,7 +1,7 @@
# Parameters for puppet-panko
#
class panko::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-pankoclient"

View File

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

View File

@ -120,12 +120,12 @@ class panko::wsgi::apache (
$custom_wsgi_process_options = {},
) {
include ::panko::deps
include ::panko::params
include ::apache
include ::apache::mod::wsgi
include panko::deps
include panko::params
include apache
include apache::mod::wsgi
if $ssl {
include ::apache::mod::ssl
include apache::mod::ssl
}
::openstacklib::wsgi::apache { 'panko_wsgi':

View File

@ -6,11 +6,11 @@ describe 'basic panko' do
it 'should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::mysql
include ::openstack_integration::keystone
include ::openstack_integration::panko
include openstack_integration
include openstack_integration::repos
include openstack_integration::mysql
include openstack_integration::keystone
include openstack_integration::panko
EOS
# Run it twice and test for idempotency

View File

@ -4,7 +4,7 @@ describe 'panko::api' do
let :pre_condition do
"class { 'panko': }
include ::panko::db
include panko::db
class {'panko::keystone::authtoken':
password => 'password',
}"
@ -129,8 +129,8 @@ describe 'panko::api' do
end
let :pre_condition do
"include ::apache
include ::panko::db
"include apache
include panko::db
class { 'panko': }
class {'panko::keystone::authtoken':
password => 'password',
@ -153,8 +153,8 @@ describe 'panko::api' do
end
let :pre_condition do
"include ::apache
include ::panko::db
"include apache
include panko::db
class { 'panko': }"
end