stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #173 from enovance/bug/172/emilien

Browse Source 
Drop "eth0" binding to use parameters in os_params
This commit is contained in:
Gonéri Le Bouder
2014-02-10 14:37:06 +01:00
parent f4ea55a930 1faad8749a
commit 60c540d716
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cache.pp
View File

@@ -21,11 +21,11 @@
# #
# [*listen_ip*] # [*listen_ip*]
# (optional) IP address on which memcached instance should listen # (optional) IP address on which memcached instance should listen
# Default to $::ipaddress_eth0 # Default in params.
# #
class cloud::cache ( class cloud::cache (
$listen_ip = $::ipaddress_eth0, $listen_ip = $os_params::internal_netif_ip,
){ ){
class { 'memcached': class { 'memcached':

2
manifests/object/ringbuilder.pp
View File

@@ -17,7 +17,7 @@
# #
class cloud::object::ringbuilder( class cloud::object::ringbuilder(
$rsyncd_ipaddress = ipaddress_eth0, $rsyncd_ipaddress = $os_params::internal_netif_ip,
$replicas = $os_params::replicas, $replicas = $os_params::replicas,
$swift_rsync_max_connections = $os_params::swift_rsync_max_connections, $swift_rsync_max_connections = $os_params::swift_rsync_max_connections,
) { ) {

2
manifests/storage/rbd/monitor.pp
View File

@@ -16,7 +16,7 @@
class cloud::storage::rbd::monitor ( class cloud::storage::rbd::monitor (
$id = $::uniqueid, $id = $::uniqueid,
$mon_addr = $::ipaddress_eth0, $mon_addr = $os_params::internal_netif_ip,
$monitor_secret = $os_params::ceph_mon_secret $monitor_secret = $os_params::ceph_mon_secret
) { ) {

4
manifests/storage/rbd/osd.pp
View File

@@ -14,8 +14,8 @@
# under the License. # under the License.
# #
class cloud::storage::rbd::osd ( class cloud::storage::rbd::osd (
$public_address = $::ipaddress_eth0, $public_address = $os_params::api_eth,
$cluster_address = $::ipaddress_eth0, $cluster_address = $os_params::storage_eth,
$devices = ['sdb','sdc'], $devices = ['sdb','sdc'],
) { ) {

10
spec/classes/cloud_cache_spec.rb
View File

@@ -22,6 +22,10 @@ describe 'cloud::cache' do
shared_examples_for 'cache server' do shared_examples_for 'cache server' do
let :params do
{ :listen_ip => '10.0.0.1' }
end
it 'configure memcached with some params' do it 'configure memcached with some params' do
should contain_class('memcached').with( should contain_class('memcached').with(
:listen_ip => '10.0.0.1', :listen_ip => '10.0.0.1',
@@ -34,8 +38,7 @@ describe 'cloud::cache' do
let :facts do let :facts do
{ :osfamily => 'Debian', { :osfamily => 'Debian',
:memorysize => '1000 MB', :memorysize => '1000 MB',
:processorcount => '1', :processorcount => '1' }
:ipaddress_eth0 => '10.0.0.1' }
end end
it_configures 'cache server' it_configures 'cache server'
@@ -45,8 +48,7 @@ describe 'cloud::cache' do
let :facts do let :facts do
{ :osfamily => 'RedHat', { :osfamily => 'RedHat',
:memorysize => '1000 MB', :memorysize => '1000 MB',
:processorcount => '1', :processorcount => '1' }
:ipaddress_eth0 => '10.0.0.1' }
end end
it_configures 'cache server' it_configures 'cache server'