openstack/puppet-neutron
Code Issues Proposed changes

Make neutron::server inherit from neutron::params

Browse Source 
This change updates the neutron::server class to inherit from
neutron::params because we are using ::neutron::params::server_service
as the default for the service name. Without this inherit, a warning may
be raised because the params class may not be loaded prior to trying to
set the default value for the service name.

Change-Id: If8f06b8ab5bf50f56090646f1bc829b231232525
Closes-Bug: #1531249
This commit is contained in:
Alex Schultz 2016-01-05 12:30:00 -07:00
parent c5777e0ce7
commit 776f9bc018
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*]
# (optional) The name of the neutron-server service
# Defaults to 'neutron-server'
# Defaults to $::neutron::params::server_service
#
# [*log_file*]
# REMOVED: Use log_file of neutron class instead.
@ -219,10 +219,9 @@ class neutron::server (
$report_interval = undef,
$state_path = undef,
$lock_path = undef,
) {
) inherits ::neutron::params {
include ::neutron::db
include ::neutron::params
include ::neutron::policy
require keystone::python