openstack/puppet-openstack-cookiecutter
Code Issues Proposed changes

Convert all class usage to relative names

Browse Source 
Change-Id: Icf39c80a8236274f31ea1a71c11bf40d7bf48380
This commit is contained in:
Tobias Urdin 2019-12-08 23:15:47 +01:00
parent ca40ce2e30
commit 25e46e8746
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-{{cookiecutter.project_name}}/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 ::{{cookiecutter.project_name}} include {{cookiecutter.project_name}}

2
puppet-{{cookiecutter.project_name}}/examples/tests/init.pp
View File

@ -9,4 +9,4 @@
# Learn more about module testing here: # Learn more about module testing here:
# http://docs.puppetlabs.com/guides/tests_smoke.html # http://docs.puppetlabs.com/guides/tests_smoke.html
# #
include ::{{cookiecutter.project_name}} include {{cookiecutter.project_name}}

2
puppet-{{cookiecutter.project_name}}/manifests/config.pp
View File

@ -24,7 +24,7 @@ class {{cookiecutter.project_name}}::config (
${{cookiecutter.project_name}}_config = {}, ${{cookiecutter.project_name}}_config = {},
) { ) {
include ::{{cookiecutter.project_name}}::deps include {{cookiecutter.project_name}}::deps
validate_legacy(Hash, 'validate_hash', ${{cookiecutter.project_name}}_config) validate_legacy(Hash, 'validate_hash', ${{cookiecutter.project_name}}_config)

2
puppet-{{cookiecutter.project_name}}/manifests/db.pp
View File

@ -54,7 +54,7 @@ class {{cookiecutter.project_name}}::db (
$database_pool_timeout = $::os_service_default, $database_pool_timeout = $::os_service_default,
) { ) {
include ::{{cookiecutter.project_name}}::deps include {{cookiecutter.project_name}}::deps
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
puppet-{{cookiecutter.project_name}}/manifests/db/mysql.pp
View File

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

2
puppet-{{cookiecutter.project_name}}/manifests/db/postgresql.pp
View File

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

2
puppet-{{cookiecutter.project_name}}/manifests/db/sync.pp
View File

@ -12,7 +12,7 @@ class {{cookiecutter.project_name}}::db::sync(
$extra_params = undef, $extra_params = undef,
) { ) {
include ::{{cookiecutter.project_name}}::deps include {{cookiecutter.project_name}}::deps
exec { '{{cookiecutter.project_name}}-db-sync': exec { '{{cookiecutter.project_name}}-db-sync':
command => "{{cookiecutter.project_name}}-manage db_sync ${extra_params}", command => "{{cookiecutter.project_name}}-manage db_sync ${extra_params}",

4
puppet-{{cookiecutter.project_name}}/manifests/init.pp
View File

@ -9,7 +9,7 @@
# #
class {{cookiecutter.project_name}} { class {{cookiecutter.project_name}} {
include ::{{cookiecutter.project_name}}::deps include {{cookiecutter.project_name}}::deps
include ::{{cookiecutter.project_name}}::params include {{cookiecutter.project_name}}::params
} }

2
puppet-{{cookiecutter.project_name}}/manifests/keystone/auth.pp
View File

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

2
puppet-{{cookiecutter.project_name}}/manifests/keystone/authtoken.pp
View File

@ -195,7 +195,7 @@ class {{cookiecutter.project_name}}::keystone::authtoken(
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
) { ) {
include ::{{cookiecutter.project_name}}::deps include {{cookiecutter.project_name}}::deps
keystone::resource::authtoken { '{{cookiecutter.project_name}}_config': keystone::resource::authtoken { '{{cookiecutter.project_name}}_config':
username => $username, username => $username,

2
puppet-{{cookiecutter.project_name}}/manifests/logging.pp
View File

@ -123,7 +123,7 @@ class {{cookiecutter.project_name}}::logging(
$log_date_format = $::os_service_default, $log_date_format = $::os_service_default,
) { ) {
include ::{{cookiecutter.project_name}}::deps include {{cookiecutter.project_name}}::deps
oslo::log { '{{cookiecutter.project_name}}_config': oslo::log { '{{cookiecutter.project_name}}_config':
use_stderr => $use_stderr, use_stderr => $use_stderr,

4
puppet-{{cookiecutter.project_name}}/manifests/params.pp
View File

@ -4,8 +4,8 @@ class {{cookiecutter.project_name}}::params {
assert_private() assert_private()
include ::{{cookiecutter.project_name}}::deps include {{cookiecutter.project_name}}::deps
include ::openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers $pyvers = $::openstacklib::defaults::pyvers
$group = '{{cookiecutter.project_name}}' $group = '{{cookiecutter.project_name}}'

4
puppet-{{cookiecutter.project_name}}/manifests/policy.pp
View File

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