From 681250724c2dfb5a40d8cfce4b655d1ab62511ba Mon Sep 17 00:00:00 2001 From: Xingchao Yu Date: Thu, 14 Jan 2016 01:37:35 +0800 Subject: [PATCH] Remove pick for managing package name. Change-Id: I861b7bfab076def6106df1a64e6479684f96a448 --- manifests/agent.pp | 7 +++---- manifests/api.pp | 7 +++---- manifests/central.pp | 7 +++---- manifests/client.pp | 8 ++++---- manifests/init.pp | 9 ++++----- manifests/sink.pp | 7 +++---- 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index ddda0792..3b7bef6b 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -10,7 +10,7 @@ # # [*agent_package_name*] # (optional) Name of the package containing agent resources -# Defaults to agent_package_name from designate::params +# Defaults to $::designate::params::agent_package_name # # [*enabled*] # (optional) Whether to enable services. @@ -26,12 +26,11 @@ # class designate::agent ( $package_ensure = present, - $agent_package_name = undef, + $agent_package_name = $::designate::params::agent_package_name, $enabled = true, $service_ensure = 'running', $backend_driver = 'bind9', ) inherits designate { - include ::designate::params designate_config { 'service:agent/backend_driver' : value => $backend_driver; @@ -41,7 +40,7 @@ class designate::agent ( enabled => $enabled, manage_service => $service_ensure, ensure_package => $package_ensure, - package_name => pick($agent_package_name, $::designate::params::agent_package_name), + package_name => $agent_package_name, service_name => $::designate::params::agent_service_name, } } diff --git a/manifests/api.pp b/manifests/api.pp index c0ea49db..f4921745 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -10,7 +10,7 @@ # # [*api_package_name*] # (optional) Name of the package containing api resources -# Defaults to api_package_name from designate::params +# Defaults to $::designate::paramas::api_package_name # # [*enabled*] # (optional) Whether to enable services. @@ -58,7 +58,7 @@ # class designate::api ( $package_ensure = present, - $api_package_name = undef, + $api_package_name = $::designate::params::api_package_name, $enabled = true, $service_ensure = 'running', $auth_strategy = 'noauth', @@ -71,7 +71,6 @@ class designate::api ( $enable_api_v1 = true, $enable_api_v2 = false, ) inherits designate { - include ::designate::params # API Service designate_config { @@ -94,7 +93,7 @@ class designate::api ( enabled => $enabled, manage_service => $service_ensure, ensure_package => $package_ensure, - package_name => pick($api_package_name, $::designate::params::api_package_name), + package_name => $api_package_name, service_name => $::designate::params::api_service_name, } diff --git a/manifests/central.pp b/manifests/central.pp index 5acc3eba..578a8e83 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -10,7 +10,7 @@ # # [*central_package_name*] # (optional) Name of the package containing central resources -# Defaults to central_package_name from designate::params +# Defaults to $::designate::params::central_package_name # # [*enabled*] # (optional) Whether to enable services. @@ -47,7 +47,7 @@ # class designate::central ( $package_ensure = present, - $central_package_name = undef, + $central_package_name = $::designate::params::central_package_name, $enabled = true, $service_ensure = 'running', $backend_driver = 'bind9', @@ -57,7 +57,6 @@ class designate::central ( $max_recordset_name_len = '255', $min_ttl = 'None', ) inherits designate { - include ::designate::params designate_config { 'service:central/backend_driver' : value => $backend_driver; @@ -72,7 +71,7 @@ class designate::central ( enabled => $enabled, manage_service => $service_ensure, ensure_package => $package_ensure, - package_name => pick($central_package_name, $::designate::params::central_package_name), + package_name => $central_package_name, service_name => $::designate::params::central_service_name, } } diff --git a/manifests/client.pp b/manifests/client.pp index 8233a365..5b2b1101 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -7,21 +7,21 @@ # [*package_ensure*] # (optional) Ensure state for pachage. # Defaults to 'present' - +# # [*client_package_name*] # (optional) Name of the package containing client resources -# Defaults to client_package_name from designate::params +# Defaults to $::designate::params::client_package_name # class designate::client ( $package_ensure = 'present', - $client_package_name = undef, + $client_package_name = $::designate::params::client_package_name, ) { include ::designate::params package { 'python-designateclient': ensure => $package_ensure, - name => pick($client_package_name, $::designate::params::client_package_name), + name => $client_package_name, tag => 'openstack', } diff --git a/manifests/init.pp b/manifests/init.pp index bb147292..33788bfe 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -10,7 +10,7 @@ # # [*common_package_name*] # (optional) Name of the package containing shared resources -# Defaults to common_package_name from designate::params +# Defaults to $::designate::params::common_package_name # # [*service_ensure*] # (optional) Whether the designate-common package will be present.. @@ -87,7 +87,7 @@ class designate( $package_ensure = present, - $common_package_name = undef, + $common_package_name = $::designate::params::common_package_name, $verbose = undef, $debug = undef, $log_dir = undef, @@ -105,7 +105,7 @@ class designate( $notification_topics = 'notifications', #DEPRECATED PARAMETER $rabbit_virtualhost = undef, -) { +) inherits designate::params { if $rabbit_virtualhost { warning('The parameter rabbit_virtualhost is deprecated, use rabbit_virtual_host.') @@ -115,7 +115,6 @@ class designate( } include ::designate::logging - include ::designate::params exec { 'post-designate_config': command => '/bin/echo "designate config has changed"', @@ -126,7 +125,7 @@ class designate( package { 'designate-common': ensure => $package_ensure, - name => pick($common_package_name, $::designate::params::common_package_name), + name => $common_package_name, tag => ['openstack', 'designate-package'], } diff --git a/manifests/sink.pp b/manifests/sink.pp index 893f9e3b..ba756e52 100644 --- a/manifests/sink.pp +++ b/manifests/sink.pp @@ -10,7 +10,7 @@ # # [*sink_package_name*] # (optional) Name of the package containing sink resources -# Defaults to sink_package_name from designate::params +# Defaults to $::designate::params::sink_package_name # # [*enabled*] # (optional) Whether to enable services. @@ -28,18 +28,17 @@ # class designate::sink ( $package_ensure = present, - $sink_package_name = undef, + $sink_package_name = $::designate::params::sink_package_name, $enabled = true, $service_ensure = 'running', $enabled_notification_handlers = undef, ) inherits designate { - include ::designate::params designate::generic_service { 'sink': enabled => $enabled, manage_service => $service_ensure, ensure_package => $package_ensure, - package_name => pick($sink_package_name, $::designate::params::sink_package_name), + package_name => $sink_package_name, service_name => $::designate::params::sink_service_name, }