openstack/puppet-neutron
Code Issues Proposed changes

params.pp: Rename client_package_name to client_package, and correctly define it

Browse Source 
Leaving this unset leads to problematic consequences if another
module does the same, as both would alias the package to nil.

node bob {
  include heat::client
  include neutron::client
}

Error: Could not retrieve catalog from remote server: Error 400 on
SERVER: Puppet::Parser::AST::Resource failed with error ArgumentError:
Cannot alias Package[python-neutronclient] to [nil] at
/etc/puppet/modules/neutron/manifests/client.pp:20; resource
["Package", nil] already declared at
/etc/puppet/modules/heat/manifests/client.pp:17 at
/etc/puppet/modules/neutron/manifests/client.pp:20 on node bob
Warning: Not using cache on failed catalog Error: Could not retrieve
catalog; skipping run

Companion change in puppet-heat: Ib0ae86d7ff406039f4b361a65c2e092d2a321a77

Change-Id: I63266ca8faa807b8aef051b319a06fa323757ceb
This commit is contained in:
Florian Haas 2013-10-17 13:16:02 +02:00
parent 92c7c060be
commit 4337bb8a63
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/client.pp
View File

@ -16,7 +16,7 @@ class neutron::client (
package { 'python-neutronclient':
ensure => $package_ensure,
name => $::neutron::params::client_package_name,
name => $::neutron::params::client_package,
}
}

2
manifests/params.pp
View File

@ -5,6 +5,7 @@ class neutron::params {
$package_name = 'openstack-neutron'
$server_package = false
$server_service = 'neutron-server'
$client_package = 'python-neutronclient'
$ovs_agent_package = false
$ovs_agent_service = 'neutron-openvswitch-agent'
@ -47,6 +48,7 @@ class neutron::params {
$package_name = 'neutron-common'
$server_package = 'neutron-server'
$server_service = 'neutron-server'
$client_package = 'python-neutronclient'
$ovs_agent_package = 'neutron-plugin-openvswitch-agent'
$ovs_agent_service = 'neutron-plugin-openvswitch-agent'