openstack
/
puppet-designate
Code Issues Proposed changes

Convert all class usage to relative names 

Change-Id: Iae69aff79cc231336b14d65305fff9c64cbd27e0
This commit is contained in:
Tobias Urdin 2019-12-08 23:04:25 +01:00
parent 2d4ad36d4d
commit b7f73b35c5
29 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/all-in-one-keystone.pp
View File

@ -23,12 +23,12 @@ node /designate/ {
$db_host = '127.0.0.1'
# == Keystone == #
class { '::keystone::db::mysql':
class { 'keystone::db::mysql':
password => $keystone_db_password,
allowed_hosts => '%',
}
class { '::keystone':
class { 'keystone':
validate_service => true,
catalog_type => 'sql',
enable_pki_setup => false,
@ -39,14 +39,14 @@ node /designate/ {
}
## Adds the admin credential to keystone.
class { '::keystone::roles::admin':
class { 'keystone::roles::admin':
email => 'admin@example.com',
password => $keystone_password,
admin_tenant => 'admin',
}
## Installs the service user endpoint.
class { '::keystone::endpoint': }
class { 'keystone::endpoint': }
# == Designate == #

2
manifests/agent.pp
View File

@ -37,7 +37,7 @@ class designate::agent (
$listen = $::os_service_default,
) inherits designate {
include ::designate::deps
include designate::deps
designate_config {
'service:agent/backend_driver' : value => $backend_driver;

4
manifests/api.pp
View File

@ -117,7 +117,7 @@ class designate::api (
$enabled_extensions_admin = $::os_service_default,
) inherits designate {
include ::designate::deps
include designate::deps
if !is_service_default($enable_api_v1) {
warning('Version 1 of API is deprecated.')
@ -146,7 +146,7 @@ class designate::api (
}
if $auth_strategy == 'keystone' {
include ::designate::keystone::authtoken
include designate::keystone::authtoken
}
designate::generic_service { 'api':

8
manifests/backend/bind9.pp
View File

@ -32,14 +32,14 @@ class designate::backend::bind9 (
$rndc_controls = undef,
) {
include ::designate::deps
include ::designate
include designate::deps
include designate
if $rndc_controls {
class { '::dns':
class { 'dns':
controls => $rndc_controls,
}
} else {
include ::dns
include dns
}
designate_config {

10
manifests/backend/powerdns.pp
View File

@ -24,10 +24,10 @@ class designate::backend::powerdns (
$sync_db = true,
) {
include ::designate::deps
include ::designate
include ::powerdns
include ::powerdns::mysql
include designate::deps
include designate
include powerdns
include powerdns::mysql
# The Ubuntu packages install several example config files in here, but only
# one of them can exist, since they all load different powerdns backends. We
@ -43,6 +43,6 @@ class designate::backend::powerdns (
}
if $sync_db {
include ::designate::db::powerdns::sync
include designate::db::powerdns::sync
}
}

4
manifests/central.pp
View File

@ -68,8 +68,8 @@ class designate::central (
$default_pool_id = $::os_service_default,
) inherits designate {
include ::designate::deps
include ::designate::db
include designate::deps
include designate::db
designate_config {
'service:central/managed_resource_email' : value => $managed_resource_email;

2
manifests/client.pp
View File

@ -17,7 +17,7 @@ class designate::client (
$client_package_name = $::designate::params::client_package_name,
) inherits ::designate::params {
include ::designate::deps
include designate::deps
package { 'python-designateclient':
ensure => $package_ensure,

2
manifests/config.pp
View File

@ -36,7 +36,7 @@ class designate::config (
$rootwrap_config = {},
) {
include ::designate::deps
include designate::deps
validate_legacy(Hash, 'validate_hash', $designate_config)
validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)

6
manifests/db.pp
View File

@ -51,8 +51,8 @@ class designate::db (
$sync_db = true,
) {
include ::designate::deps
include ::designate::params
include designate::deps
include designate::params
validate_legacy(String, 'validate_re', $database_connection,
['(mysql(\+pymysql)?):\/\/(\S+:\S+@\S+\/\S+)?'])
@ -91,7 +91,7 @@ class designate::db (
}
if $sync_db {
include ::designate::db::sync
include designate::db::sync
}
}

2
manifests/db/mysql.pp
View File

@ -41,7 +41,7 @@ class designate::db::mysql(
$allowed_hosts = undef,
) {
include ::designate::deps
include designate::deps
::openstacklib::db::mysql { 'designate':
user => $user,

2
manifests/db/powerdns/mysql.pp
View File

@ -41,7 +41,7 @@ class designate::db::powerdns::mysql (
$allowed_hosts = undef,
) {
include ::designate::deps
include designate::deps
::openstacklib::db::mysql { 'powerdns':
user => $user,

4
manifests/db/powerdns/sync.pp
View File

@ -13,8 +13,8 @@ class designate::db::powerdns::sync(
$extra_params = undef,
) {
include ::designate::deps
include ::designate::params
include designate::deps
include designate::params
exec { 'designate-powerdns-dbsync':
command => "designate-manage ${extra_params} powerdns sync",

2
manifests/db/sync.pp
View File

@ -14,7 +14,7 @@ class designate::db::sync(
$extra_params = undef,
) {
include ::designate::deps
include designate::deps
exec { 'designate-dbsync':
command => "designate-manage ${extra_params} database sync",

4
manifests/generic_service.pp
View File

@ -39,8 +39,8 @@ define designate::generic_service(
$package_ensure = 'present',
) {
include ::designate::deps
include ::designate::params
include designate::deps
include designate::params
$designate_title = "designate-${name}"
Exec['post-designate_config'] ~> Anchor['designate::service::end']

2
manifests/init.pp
View File

@ -148,7 +148,7 @@ class designate(
fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together')
}
include ::designate::deps
include designate::deps
exec { 'post-designate_config':
command => '/bin/echo "designate config has changed"',

2
manifests/keystone/auth.pp
View File

@ -87,7 +87,7 @@ class designate::keystone::auth (
$internal_url = 'http://127.0.0.1:9001/v1',
) {
include ::designate::deps
include designate::deps
if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~> Anchor['designate::service::end']

2
manifests/keystone/authtoken.pp
View File

@ -208,7 +208,7 @@ class designate::keystone::authtoken(
$service_token_roles_required = $::os_service_default,
) {
include ::designate::deps
include designate::deps
if is_service_default($password) {
fail('Please set password for designate service user')

2
manifests/logging.pp
View File

@ -119,7 +119,7 @@ class designate::logging(
$log_date_format = $::os_service_default,
) inherits ::designate::params {
include ::designate::deps
include designate::deps
oslo::log { 'designate_config':
debug => $debug,

4
manifests/mdns.pp
View File

@ -67,8 +67,8 @@ class designate::mdns (
$listen = $::os_service_default,
) inherits designate {
include ::designate::deps
include ::designate::db
include designate::deps
include designate::db
designate_config {
'service:mdns/workers' : value => $workers;

2
manifests/params.pp
View File

@ -3,7 +3,7 @@
# Parameters for puppet-designate
#
class designate::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$state_path = '/var/lib/designate'

4
manifests/policy.pp
View File

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

2
manifests/pool.pp
View File

@ -19,7 +19,7 @@ define designate::pool(
$also_notifies = [],
){
include ::designate::deps
include designate::deps
validate_legacy(Pattern[/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/],
'validate_re', $name, ['[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}',

2
manifests/pool_nameserver.pp
View File

@ -13,7 +13,7 @@ define designate::pool_nameserver(
$host = '127.0.0.1',
){
include ::designate::deps
include designate::deps
validate_legacy(Pattern[/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/],
'validate_re', $name, ['[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}',

6
manifests/pool_target.pp
View File

@ -28,11 +28,11 @@ define designate::pool_target (
$masters = ['127.0.0.1:5354'],
) {
include ::designate::deps
include designate::deps
if target == 'powerdns' {
include ::powerdns
include ::powerdns::mysql
include powerdns
include powerdns::mysql
}
validate_legacy(Pattern[/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/],

2
manifests/quota.pp
View File

@ -37,7 +37,7 @@ class designate::quota (
$quota_recordset_records = $::os_service_default,
) {
include ::designate::deps
include designate::deps
designate_config {
'DEFAULT/quota_api_export_size': value => $quota_api_export_size;

2
manifests/sink.pp
View File

@ -34,7 +34,7 @@ class designate::sink (
$enabled_notification_handlers = undef,
) inherits designate {
include ::designate::deps
include designate::deps
designate::generic_service { 'sink':
enabled => $enabled,

4
manifests/worker.pp
View File

@ -83,8 +83,8 @@ class designate::worker(
$worker_topic = $::os_service_default,
) {
include ::designate::deps
include ::designate::params
include designate::deps
include designate::params
if $manage_package {
package { 'designate-worker':

12
spec/acceptance/basic_designate_spec.rb
View File

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

2
spec/classes/designate_api_spec.rb
View File

@ -6,7 +6,7 @@ require 'spec_helper'
describe 'designate::api' do
let :pre_condition do
"class { '::designate::keystone::authtoken':
"class { 'designate::keystone::authtoken':
password => 'a_big_secret',
}"
end