openstack/puppet-neutron
Code Issues Proposed changes

Merge "Make neutron::server inherit from neutron::params"

Browse Source
This commit is contained in:
Jenkins 2016-01-07 20:06:05 +00:00 committed by Gerrit Code Review
commit 41a0480025
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/server.pp
View File

@ -18,7 +18,7 @@
# #
# [*service_name*] # [*service_name*]
# (optional) The name of the neutron-server service # (optional) The name of the neutron-server service
# Defaults to 'neutron-server' # Defaults to $::neutron::params::server_service
# #
# [*log_file*] # [*log_file*]
# REMOVED: Use log_file of neutron class instead. # REMOVED: Use log_file of neutron class instead.
@ -219,10 +219,9 @@ class neutron::server (
$report_interval = undef, $report_interval = undef,
$state_path = undef, $state_path = undef,
$lock_path = undef, $lock_path = undef,
) { ) inherits ::neutron::params {
include ::neutron::db include ::neutron::db
include ::neutron::params
include ::neutron::policy include ::neutron::policy
require keystone::python require keystone::python