[volume] Export syslog mgmt and facility through params
Refs: GH-78
This commit is contained in:
@@ -13,9 +13,61 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
#
|
#
|
||||||
# Volume Common
|
|
||||||
#
|
#
|
||||||
|
# == Class: cloud::volume
|
||||||
|
#
|
||||||
|
# Common class for volume nodes
|
||||||
|
#
|
||||||
|
# === Parameters:
|
||||||
|
#
|
||||||
|
# [*cinder_db_host*]
|
||||||
|
# (optional) Cinder database host
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*cinder_db_user*]
|
||||||
|
# (optional) Cinder database user
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*cinder_db_password*]
|
||||||
|
# (optional) Cinder database password
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*rabbit_hosts*]
|
||||||
|
# (optional) List of RabbitMQ servers. Should be an array.
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*rabbit_password*]
|
||||||
|
# (optional) Password to connect to nova queues.
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*ks_keystone_internal_host*]
|
||||||
|
# (optional) Keystone host (authentication)
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*ks_cinder_password*]
|
||||||
|
# (optional) Keystone password for cinder user.
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*verbose*]
|
||||||
|
# (optional) Set log output to verbose output
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*debug*]
|
||||||
|
# (optional) Set log output to debug output
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*tunnel_eth*]
|
||||||
|
# (optional) Which interface we connect to create overlay tunnels.
|
||||||
|
# Default value in params
|
||||||
|
#
|
||||||
|
# [*use_syslog*]
|
||||||
|
# (optional) Use syslog for logging
|
||||||
|
# Defaults value in params
|
||||||
|
#
|
||||||
|
# [*log_facility*]
|
||||||
|
# (optional) Syslog facility to receive log lines
|
||||||
|
# Defaults value in params
|
||||||
|
#
|
||||||
class cloud::volume(
|
class cloud::volume(
|
||||||
$cinder_db_host = $os_params::cinder_db_host,
|
$cinder_db_host = $os_params::cinder_db_host,
|
||||||
$cinder_db_user = $os_params::cinder_db_user,
|
$cinder_db_user = $os_params::cinder_db_user,
|
||||||
@@ -26,6 +78,8 @@ class cloud::volume(
|
|||||||
$ks_cinder_password = $os_params::ks_cinder_password,
|
$ks_cinder_password = $os_params::ks_cinder_password,
|
||||||
$verbose = $os_params::verbose,
|
$verbose = $os_params::verbose,
|
||||||
$debug = $os_params::debug,
|
$debug = $os_params::debug,
|
||||||
|
$log_facility = $os_params::cinder_log_facility,
|
||||||
|
$use_syslog = $os_params::cinder_use_syslog
|
||||||
) {
|
) {
|
||||||
|
|
||||||
$encoded_user = uriescape($cinder_db_user)
|
$encoded_user = uriescape($cinder_db_user)
|
||||||
@@ -40,8 +94,8 @@ class cloud::volume(
|
|||||||
rabbit_virtual_host => '/',
|
rabbit_virtual_host => '/',
|
||||||
verbose => $verbose,
|
verbose => $verbose,
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
log_facility => 'LOG_LOCAL0',
|
log_facility => $log_facility,
|
||||||
use_syslog => true
|
use_syslog => $use_syslog
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'cinder::ceilometer': }
|
class { 'cinder::ceilometer': }
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ describe 'cloud::volume::controller' do
|
|||||||
ks_keystone_internal_host => '10.0.0.1',
|
ks_keystone_internal_host => '10.0.0.1',
|
||||||
ks_cinder_password => 'secrete',
|
ks_cinder_password => 'secrete',
|
||||||
verbose => true,
|
verbose => true,
|
||||||
debug => true }"
|
debug => true,
|
||||||
|
log_facility => 'LOG_LOCAL0',
|
||||||
|
use_syslog => true }"
|
||||||
end
|
end
|
||||||
|
|
||||||
let :params do
|
let :params do
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ describe 'cloud::volume::storage' do
|
|||||||
ks_keystone_internal_host => '10.0.0.1',
|
ks_keystone_internal_host => '10.0.0.1',
|
||||||
ks_cinder_password => 'secrete',
|
ks_cinder_password => 'secrete',
|
||||||
verbose => true,
|
verbose => true,
|
||||||
debug => true }"
|
debug => true,
|
||||||
|
log_facility => 'LOG_LOCAL0',
|
||||||
|
use_syslog => true }"
|
||||||
end
|
end
|
||||||
|
|
||||||
let :params do
|
let :params do
|
||||||
|
|||||||
Reference in New Issue
Block a user