Prepare for voxpupuli-puppet-lint-plugins
Fix new lint errors detected when full of the voxpupili lint plugins are enabled. Change-Id: I9705ad334d05a2041f0f9c4b885fc3fd44342720 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -5,7 +5,6 @@
|
|||||||
# dig www.example.net @127.0.0.1 +short
|
# dig www.example.net @127.0.0.1 +short
|
||||||
#
|
#
|
||||||
node /designate/ {
|
node /designate/ {
|
||||||
|
|
||||||
include apt
|
include apt
|
||||||
include rabbitmq
|
include rabbitmq
|
||||||
include mysql::server
|
include mysql::server
|
||||||
@@ -25,7 +24,7 @@ node /designate/ {
|
|||||||
# == Keystone == #
|
# == Keystone == #
|
||||||
class { 'keystone::db::mysql':
|
class { 'keystone::db::mysql':
|
||||||
password => $keystone_db_password,
|
password => $keystone_db_password,
|
||||||
allowed_hosts => '%',
|
allowed_hosts => '%',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'keystone':
|
class { 'keystone':
|
||||||
@@ -35,26 +34,25 @@ node /designate/ {
|
|||||||
admin_token => $keystone_admin_token,
|
admin_token => $keystone_admin_token,
|
||||||
token_provider => 'keystone.token.providers.uuid.Provider',
|
token_provider => 'keystone.token.providers.uuid.Provider',
|
||||||
token_driver => 'keystone.token.backends.sql.Token',
|
token_driver => 'keystone.token.backends.sql.Token',
|
||||||
database_connection => "mysql://keystone:${keystone_db_password}@${keystone_db_host}/keystone",
|
database_connection => "mysql://keystone:${keystone_db_password}@${keystone_db_host}/keystone",
|
||||||
}
|
}
|
||||||
|
|
||||||
## Adds the admin credential to keystone.
|
## Adds the admin credential to keystone.
|
||||||
class { 'keystone::roles::admin':
|
class { 'keystone::roles::admin':
|
||||||
email => 'admin@example.com',
|
email => 'admin@example.com',
|
||||||
password => $keystone_password,
|
password => $keystone_password,
|
||||||
admin_tenant => 'admin',
|
admin_tenant => 'admin',
|
||||||
}
|
}
|
||||||
|
|
||||||
## Installs the service user endpoint.
|
## Installs the service user endpoint.
|
||||||
class { 'keystone::endpoint': }
|
class { 'keystone::endpoint': }
|
||||||
|
|
||||||
|
|
||||||
# == Designate == #
|
# == Designate == #
|
||||||
class {'designate::db::mysql':
|
class { 'designate::db::mysql':
|
||||||
password => $designate_db_password,
|
password => $designate_db_password,
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'designate':
|
class { 'designate':
|
||||||
default_transport_url => os_transport_url({
|
default_transport_url => os_transport_url({
|
||||||
'transport' => 'rabbit',
|
'transport' => 'rabbit',
|
||||||
'host' => '127.0.0.1',
|
'host' => '127.0.0.1',
|
||||||
@@ -64,12 +62,12 @@ node /designate/ {
|
|||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'designate::db':
|
class { 'designate::db':
|
||||||
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate",
|
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate",
|
||||||
}
|
}
|
||||||
|
|
||||||
include designate::client
|
include designate::client
|
||||||
class {'designate::api':
|
class { 'designate::api':
|
||||||
auth_strategy => $auth_strategy,
|
auth_strategy => $auth_strategy,
|
||||||
keystone_password => $keystone_password,
|
keystone_password => $keystone_password,
|
||||||
}
|
}
|
||||||
@@ -77,12 +75,12 @@ node /designate/ {
|
|||||||
include designate::central
|
include designate::central
|
||||||
|
|
||||||
include designate::dns
|
include designate::dns
|
||||||
class {'designate::backend::bind9':
|
class { 'designate::backend::bind9':
|
||||||
rndc_config_file => '',
|
rndc_config_file => '',
|
||||||
rndc_key_file => '',
|
rndc_key_file => '',
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'designate::keystone::auth':
|
class { 'designate::keystone::auth':
|
||||||
password => $keystone_password,
|
password => $keystone_password,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
node /designate/ {
|
node /designate/ {
|
||||||
|
|
||||||
include apt
|
include apt
|
||||||
include rabbitmq
|
include rabbitmq
|
||||||
include mysql::server
|
include mysql::server
|
||||||
@@ -9,16 +8,14 @@ node /designate/ {
|
|||||||
$designate_db_password = 'admin'
|
$designate_db_password = 'admin'
|
||||||
$db_host = '127.0.0.1'
|
$db_host = '127.0.0.1'
|
||||||
|
|
||||||
|
|
||||||
include designate::dns
|
include designate::dns
|
||||||
include designate::backend::bind9
|
include designate::backend::bind9
|
||||||
|
|
||||||
class {'designate::db::mysql':
|
class { 'designate::db::mysql':
|
||||||
password => $designate_db_password,
|
password => $designate_db_password,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class { 'designate':
|
||||||
class {'designate':
|
|
||||||
default_transport_url => os_transport_url({
|
default_transport_url => os_transport_url({
|
||||||
'transport' => 'rabbit',
|
'transport' => 'rabbit',
|
||||||
'host' => '127.0.0.1',
|
'host' => '127.0.0.1',
|
||||||
@@ -28,11 +25,11 @@ node /designate/ {
|
|||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'designate::db':
|
class { 'designate::db':
|
||||||
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate",
|
database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate",
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'designate::api':
|
class { 'designate::api':
|
||||||
auth_strategy => $auth_strategy,
|
auth_strategy => $auth_strategy,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -131,7 +131,6 @@ class designate::api (
|
|||||||
$max_request_body_size = $facts['os_service_default'],
|
$max_request_body_size = $facts['os_service_default'],
|
||||||
$service_name = $designate::params::api_service_name,
|
$service_name = $designate::params::api_service_name,
|
||||||
) inherits designate {
|
) inherits designate {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::policy
|
include designate::policy
|
||||||
|
|
||||||
@@ -179,7 +178,6 @@ class designate::api (
|
|||||||
|
|
||||||
# On any paste-api.ini config change, we must restart Designate API.
|
# On any paste-api.ini config change, we must restart Designate API.
|
||||||
Designate_api_paste_ini<||> ~> Service[$service_name]
|
Designate_api_paste_ini<||> ~> Service[$service_name]
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$service_name_real = $service_name
|
$service_name_real = $service_name
|
||||||
|
|
||||||
|
@@ -63,7 +63,7 @@ class designate::backend::bind9 (
|
|||||||
$rndc_key_file = undef,
|
$rndc_key_file = undef,
|
||||||
$rndc_controls = undef,
|
$rndc_controls = undef,
|
||||||
$rndc_port = undef,
|
$rndc_port = undef,
|
||||||
Hash[Integer, String] $ns_records = {1 => 'ns1.example.org.'},
|
Hash[Integer, String] $ns_records = { 1 => 'ns1.example.org.' },
|
||||||
Array[String[1], 1] $nameservers = ['127.0.0.1'],
|
Array[String[1], 1] $nameservers = ['127.0.0.1'],
|
||||||
Array[String[1], 1] $bind9_hosts = ['127.0.0.1'],
|
Array[String[1], 1] $bind9_hosts = ['127.0.0.1'],
|
||||||
$dns_port = 53,
|
$dns_port = 53,
|
||||||
@@ -73,7 +73,6 @@ class designate::backend::bind9 (
|
|||||||
Array[String[1]] $also_notifies = [],
|
Array[String[1]] $also_notifies = [],
|
||||||
Hash[String[1], String[1]] $attributes = {},
|
Hash[String[1], String[1]] $attributes = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::params
|
include designate::params
|
||||||
|
|
||||||
|
@@ -52,7 +52,6 @@ class designate::backend::pdns4 (
|
|||||||
Array[String[1]] $also_notifies = [],
|
Array[String[1]] $also_notifies = [],
|
||||||
Hash[String[1], String[1]] $attributes = {},
|
Hash[String[1], String[1]] $attributes = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::params
|
include designate::params
|
||||||
|
|
||||||
|
@@ -71,7 +71,6 @@ class designate::central (
|
|||||||
$default_pool_id = $facts['os_service_default'],
|
$default_pool_id = $facts['os_service_default'],
|
||||||
$scheduler_filters = $facts['os_service_default'],
|
$scheduler_filters = $facts['os_service_default'],
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::db
|
include designate::db
|
||||||
|
|
||||||
|
@@ -16,7 +16,6 @@ class designate::client (
|
|||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$client_package_name = $designate::params::client_package_name,
|
$client_package_name = $designate::params::client_package_name,
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
package { 'python-designateclient':
|
package { 'python-designateclient':
|
||||||
@@ -26,5 +25,4 @@ class designate::client (
|
|||||||
}
|
}
|
||||||
|
|
||||||
include openstacklib::openstackclient
|
include openstacklib::openstackclient
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,6 @@ class designate::config (
|
|||||||
Hash $api_paste_ini_config = {},
|
Hash $api_paste_ini_config = {},
|
||||||
Hash $rootwrap_config = {},
|
Hash $rootwrap_config = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
create_resources('designate_config', $designate_config)
|
create_resources('designate_config', $designate_config)
|
||||||
|
@@ -23,10 +23,9 @@ class designate::coordination (
|
|||||||
$heartbeat_interval = $facts['os_service_default'],
|
$heartbeat_interval = $facts['os_service_default'],
|
||||||
$run_watchers_interval = $facts['os_service_default'],
|
$run_watchers_interval = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
oslo::coordination{ 'designate_config':
|
oslo::coordination { 'designate_config':
|
||||||
backend_url => $backend_url,
|
backend_url => $backend_url,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -44,7 +44,6 @@ class designate::cors (
|
|||||||
$allow_methods = $facts['os_service_default'],
|
$allow_methods = $facts['os_service_default'],
|
||||||
$allow_headers = $facts['os_service_default'],
|
$allow_headers = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
oslo::cors { 'designate_config':
|
oslo::cors { 'designate_config':
|
||||||
|
@@ -62,7 +62,6 @@ class designate::db (
|
|||||||
$mysql_enable_ndb = $facts['os_service_default'],
|
$mysql_enable_ndb = $facts['os_service_default'],
|
||||||
Boolean $sync_db = true,
|
Boolean $sync_db = true,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
oslo::db { 'designate_config':
|
oslo::db { 'designate_config':
|
||||||
|
@@ -31,7 +31,7 @@
|
|||||||
# (Optional) Additional hosts that are allowed to access this DB
|
# (Optional) Additional hosts that are allowed to access this DB
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class designate::db::mysql(
|
class designate::db::mysql (
|
||||||
$password,
|
$password,
|
||||||
$dbname = 'designate',
|
$dbname = 'designate',
|
||||||
$user = 'designate',
|
$user = 'designate',
|
||||||
@@ -40,7 +40,6 @@ class designate::db::mysql(
|
|||||||
$collate = 'utf8_general_ci',
|
$collate = 'utf8_general_ci',
|
||||||
$allowed_hosts = undef,
|
$allowed_hosts = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
openstacklib::db::mysql { 'designate':
|
openstacklib::db::mysql { 'designate':
|
||||||
@@ -56,5 +55,4 @@ class designate::db::mysql(
|
|||||||
Anchor['designate::db::begin']
|
Anchor['designate::db::begin']
|
||||||
~> Class['designate::db::mysql']
|
~> Class['designate::db::mysql']
|
||||||
~> Anchor['designate::db::end']
|
~> Anchor['designate::db::end']
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -24,14 +24,13 @@
|
|||||||
# (Optional) Privileges given to the database user.
|
# (Optional) Privileges given to the database user.
|
||||||
# Default to 'ALL'
|
# Default to 'ALL'
|
||||||
#
|
#
|
||||||
class designate::db::postgresql(
|
class designate::db::postgresql (
|
||||||
$password,
|
$password,
|
||||||
$dbname = 'designate',
|
$dbname = 'designate',
|
||||||
$user = 'designate',
|
$user = 'designate',
|
||||||
$encoding = undef,
|
$encoding = undef,
|
||||||
$privileges = 'ALL',
|
$privileges = 'ALL',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
openstacklib::db::postgresql { 'designate':
|
openstacklib::db::postgresql { 'designate':
|
||||||
@@ -42,7 +41,6 @@ class designate::db::postgresql(
|
|||||||
privileges => $privileges,
|
privileges => $privileges,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Anchor['designate::db::begin']
|
Anchor['designate::db::begin']
|
||||||
~> Class['designate::db::postgresql']
|
~> Class['designate::db::postgresql']
|
||||||
~> Anchor['designate::db::end']
|
~> Anchor['designate::db::end']
|
||||||
|
@@ -14,11 +14,10 @@
|
|||||||
# (Optional) Timeout for the execution of the db_sync
|
# (Optional) Timeout for the execution of the db_sync
|
||||||
# Defaults to 300
|
# Defaults to 300
|
||||||
#
|
#
|
||||||
class designate::db::sync(
|
class designate::db::sync (
|
||||||
$extra_params = undef,
|
$extra_params = undef,
|
||||||
$db_sync_timeout = 300,
|
$db_sync_timeout = 300,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::params
|
include designate::params
|
||||||
|
|
||||||
@@ -39,5 +38,4 @@ class designate::db::sync(
|
|||||||
notify => Anchor['designate::dbsync::end'],
|
notify => Anchor['designate::dbsync::end'],
|
||||||
tag => 'openstack-db',
|
tag => 'openstack-db',
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -31,14 +31,13 @@
|
|||||||
# (optional) Control the ensure parameter for the package resource.
|
# (optional) Control the ensure parameter for the package resource.
|
||||||
# Defaults to 'present'.
|
# Defaults to 'present'.
|
||||||
#
|
#
|
||||||
define designate::generic_service(
|
define designate::generic_service (
|
||||||
$package_name,
|
$package_name,
|
||||||
$service_name,
|
$service_name,
|
||||||
Boolean $enabled = false,
|
Boolean $enabled = false,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::params
|
include designate::params
|
||||||
|
|
||||||
|
@@ -46,7 +46,6 @@ class designate::healthcheck (
|
|||||||
$disable_by_file_paths = $facts['os_service_default'],
|
$disable_by_file_paths = $facts['os_service_default'],
|
||||||
$enable_by_file_paths = $facts['os_service_default'],
|
$enable_by_file_paths = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
oslo::healthcheck { 'designate_config':
|
oslo::healthcheck { 'designate_config':
|
||||||
|
@@ -195,7 +195,7 @@
|
|||||||
# will be run through a green thread.
|
# will be run through a green thread.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class designate(
|
class designate (
|
||||||
$package_ensure = present,
|
$package_ensure = present,
|
||||||
$common_package_name = $designate::params::common_package_name,
|
$common_package_name = $designate::params::common_package_name,
|
||||||
$host = $facts['os_service_default'],
|
$host = $facts['os_service_default'],
|
||||||
@@ -237,7 +237,6 @@ class designate(
|
|||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$rabbit_heartbeat_in_pthread = undef,
|
$rabbit_heartbeat_in_pthread = undef,
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
package { 'designate-common':
|
package { 'designate-common':
|
||||||
@@ -298,5 +297,4 @@ class designate(
|
|||||||
'DEFAULT/default_ttl': value => $default_ttl;
|
'DEFAULT/default_ttl': value => $default_ttl;
|
||||||
'DEFAULT/supported_record_type': value => join(any2array($supported_record_type), ',');
|
'DEFAULT/supported_record_type': value => join(any2array($supported_record_type), ',');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -56,7 +56,6 @@ class designate::keystone (
|
|||||||
$status_code_retries = $facts['os_service_default'],
|
$status_code_retries = $facts['os_service_default'],
|
||||||
$status_code_retry_delay = $facts['os_service_default'],
|
$status_code_retry_delay = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -106,7 +106,6 @@ class designate::keystone::auth (
|
|||||||
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:9001',
|
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:9001',
|
||||||
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:9001',
|
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:9001',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
Keystone::Resource::Service_identity['designate'] -> Anchor['designate::service::end']
|
Keystone::Resource::Service_identity['designate'] -> Anchor['designate::service::end']
|
||||||
@@ -131,5 +130,4 @@ class designate::keystone::auth (
|
|||||||
internal_url => $internal_url,
|
internal_url => $internal_url,
|
||||||
admin_url => $admin_url,
|
admin_url => $admin_url,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -199,7 +199,7 @@
|
|||||||
# (Optional) Hash of additional parameters to pass through to the keystone
|
# (Optional) Hash of additional parameters to pass through to the keystone
|
||||||
# authtoken class. Values set here override the individual parameters above.
|
# authtoken class. Values set here override the individual parameters above.
|
||||||
#
|
#
|
||||||
class designate::keystone::authtoken(
|
class designate::keystone::authtoken (
|
||||||
String[1] $password,
|
String[1] $password,
|
||||||
$username = 'designate',
|
$username = 'designate',
|
||||||
$auth_url = 'http://localhost:5000',
|
$auth_url = 'http://localhost:5000',
|
||||||
@@ -239,7 +239,6 @@ class designate::keystone::authtoken(
|
|||||||
$interface = $facts['os_service_default'],
|
$interface = $facts['os_service_default'],
|
||||||
$params = {}
|
$params = {}
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
keystone::resource::authtoken {
|
keystone::resource::authtoken {
|
||||||
|
@@ -97,7 +97,7 @@
|
|||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
# Example: 'Y-%m-%d %H:%M:%S'
|
# Example: 'Y-%m-%d %H:%M:%S'
|
||||||
#
|
#
|
||||||
class designate::logging(
|
class designate::logging (
|
||||||
$use_syslog = $facts['os_service_default'],
|
$use_syslog = $facts['os_service_default'],
|
||||||
$use_json = $facts['os_service_default'],
|
$use_json = $facts['os_service_default'],
|
||||||
$use_journal = $facts['os_service_default'],
|
$use_journal = $facts['os_service_default'],
|
||||||
@@ -118,7 +118,6 @@ class designate::logging(
|
|||||||
$instance_uuid_format = $facts['os_service_default'],
|
$instance_uuid_format = $facts['os_service_default'],
|
||||||
$log_date_format = $facts['os_service_default'],
|
$log_date_format = $facts['os_service_default'],
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
oslo::log { 'designate_config':
|
oslo::log { 'designate_config':
|
||||||
@@ -142,5 +141,4 @@ class designate::logging(
|
|||||||
instance_format => $instance_format,
|
instance_format => $instance_format,
|
||||||
instance_uuid_format => $instance_uuid_format,
|
instance_uuid_format => $instance_uuid_format,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -66,7 +66,6 @@ class designate::mdns (
|
|||||||
$max_message_size = $facts['os_service_default'],
|
$max_message_size = $facts['os_service_default'],
|
||||||
$listen = $facts['os_service_default'],
|
$listen = $facts['os_service_default'],
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::db
|
include designate::db
|
||||||
|
|
||||||
|
@@ -29,5 +29,4 @@ class designate::network_api::neutron (
|
|||||||
'network_api:neutron/endpoint_type': value => $endpoint_type;
|
'network_api:neutron/endpoint_type': value => $endpoint_type;
|
||||||
'network_api:neutron/timeout': value => $timeout;
|
'network_api:neutron/timeout': value => $timeout;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,6 @@ class designate::policy (
|
|||||||
$policy_dirs = $facts['os_service_default'],
|
$policy_dirs = $facts['os_service_default'],
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::params
|
include designate::params
|
||||||
|
|
||||||
@@ -82,5 +81,4 @@ class designate::policy (
|
|||||||
policy_default_rule => $policy_default_rule,
|
policy_default_rule => $policy_default_rule,
|
||||||
policy_dirs => $policy_dirs,
|
policy_dirs => $policy_dirs,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -41,7 +41,6 @@ class designate::producer (
|
|||||||
$threads = $facts['os_service_default'],
|
$threads = $facts['os_service_default'],
|
||||||
$enabled_tasks = $facts['os_service_default'],
|
$enabled_tasks = $facts['os_service_default'],
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -21,7 +21,6 @@ class designate::producer_task::delayed_notify (
|
|||||||
$per_page = $facts['os_service_default'],
|
$per_page = $facts['os_service_default'],
|
||||||
$batch_size = $facts['os_service_default'],
|
$batch_size = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -21,7 +21,6 @@ class designate::producer_task::increment_serial (
|
|||||||
$per_page = $facts['os_service_default'],
|
$per_page = $facts['os_service_default'],
|
||||||
$batch_size = $facts['os_service_default'],
|
$batch_size = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -16,7 +16,6 @@ class designate::producer_task::periodic_exists (
|
|||||||
$interval = $facts['os_service_default'],
|
$interval = $facts['os_service_default'],
|
||||||
$per_page = $facts['os_service_default'],
|
$per_page = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -16,7 +16,6 @@ class designate::producer_task::periodic_secondary_refresh (
|
|||||||
$interval = $facts['os_service_default'],
|
$interval = $facts['os_service_default'],
|
||||||
$per_page = $facts['os_service_default'],
|
$per_page = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -16,7 +16,6 @@ class designate::producer_task::worker_periodic_recovery (
|
|||||||
$interval = $facts['os_service_default'],
|
$interval = $facts['os_service_default'],
|
||||||
$per_page = $facts['os_service_default'],
|
$per_page = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -27,7 +27,6 @@ class designate::producer_task::zone_purge (
|
|||||||
$time_threshold = $facts['os_service_default'],
|
$time_threshold = $facts['os_service_default'],
|
||||||
$batch_size = $facts['os_service_default'],
|
$batch_size = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -36,7 +36,6 @@ class designate::quota (
|
|||||||
$quota_driver = $facts['os_service_default'],
|
$quota_driver = $facts['os_service_default'],
|
||||||
$quota_recordset_records = $facts['os_service_default'],
|
$quota_recordset_records = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -17,12 +17,11 @@
|
|||||||
# is set.
|
# is set.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class designate::reports(
|
class designate::reports (
|
||||||
$log_dir = $facts['os_service_default'],
|
$log_dir = $facts['os_service_default'],
|
||||||
$file_event_handler = $facts['os_service_default'],
|
$file_event_handler = $facts['os_service_default'],
|
||||||
$file_event_handler_interval = $facts['os_service_default'],
|
$file_event_handler_interval = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
oslo::reports { 'designate_config':
|
oslo::reports { 'designate_config':
|
||||||
|
@@ -43,7 +43,6 @@ class designate::sink (
|
|||||||
$threads = $facts['os_service_default'],
|
$threads = $facts['os_service_default'],
|
||||||
$enabled_notification_handlers = $facts['os_service_default'],
|
$enabled_notification_handlers = $facts['os_service_default'],
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate::generic_service { 'sink':
|
designate::generic_service { 'sink':
|
||||||
|
@@ -31,7 +31,6 @@ class designate::sink::neutron_floatingip (
|
|||||||
$formatv4 = $facts['os_service_default'],
|
$formatv4 = $facts['os_service_default'],
|
||||||
$formatv6 = $facts['os_service_default'],
|
$formatv6 = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -31,7 +31,6 @@ class designate::sink::nova_fixed (
|
|||||||
$formatv4 = $facts['os_service_default'],
|
$formatv4 = $facts['os_service_default'],
|
||||||
$formatv6 = $facts['os_service_default'],
|
$formatv6 = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@@ -76,7 +76,7 @@
|
|||||||
# (Optional) Send all traffic over TCP.
|
# (Optional) Send all traffic over TCP.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class designate::worker(
|
class designate::worker (
|
||||||
$package_ensure = present,
|
$package_ensure = present,
|
||||||
$worker_package_name = $designate::params::worker_package_name,
|
$worker_package_name = $designate::params::worker_package_name,
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
@@ -96,7 +96,6 @@ class designate::worker(
|
|||||||
$serial_timeout = $facts['os_service_default'],
|
$serial_timeout = $facts['os_service_default'],
|
||||||
$all_tcp = $facts['os_service_default'],
|
$all_tcp = $facts['os_service_default'],
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
designate::generic_service { 'worker':
|
designate::generic_service { 'worker':
|
||||||
|
@@ -150,7 +150,6 @@ class designate::wsgi::apache (
|
|||||||
$request_headers = undef,
|
$request_headers = undef,
|
||||||
$vhost_custom_fragment = undef,
|
$vhost_custom_fragment = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
include designate::params
|
include designate::params
|
||||||
|
|
||||||
|
@@ -25,8 +25,7 @@ class designate::wsgi::uwsgi (
|
|||||||
$processes = $facts['os_workers'],
|
$processes = $facts['os_workers'],
|
||||||
$threads = 32,
|
$threads = 32,
|
||||||
$listen_queue_size = 100,
|
$listen_queue_size = 100,
|
||||||
){
|
) {
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
if $facts['os']['name'] != 'Debian' {
|
if $facts['os']['name'] != 'Debian' {
|
||||||
|
Reference in New Issue
Block a user