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

Drop "eth0" binding to use parameters in os_params

manifests/cache.pp

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

manifests/object/ringbuilder.pp

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

manifests/storage/rbd/monitor.pp

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

manifests/storage/rbd/osd.pp

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

spec/classes/cloud_cache_spec.rb

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