Merge pull request #43 from branan/single_replica_example

Use a single replica in the all-in-one example

examples/all.pp

@@ -29,38 +29,25 @@ class { 'swift::storage':
 }
 
 # create xfs partitions on a loopback device and mounts them
-swift::storage::loopback { ['4', '2', '3']:
+swift::storage::loopback { '2':
   require => Class['swift'],
 }
 
 # sets up storage nodes which is composed of a single
 # device that contains an endpoint for an object, account, and container
 
-Swift::Storage::Node {
+swift::storage::node { '2':
   mnt_base_dir         => '/srv/node',
   weight               => 1,
   manage_ring          => true,
+  zone                 => '2',
   storage_local_net_ip => $swift_local_net_ip,
-}
-
-swift::storage::node { '4':
-  zone    => 4,
-  require => Swift::Storage::Loopback[4],
-}
-
-swift::storage::node { '2':
-  zone    => 2,
-  require => Swift::Storage::Loopback[2],
-}
-
-swift::storage::node { '3':
-  zone    => 3,
-  require => Swift::Storage::Loopback[3],
+  require              => Swift::Storage::Loopback[2] ,
 }
 
 class { 'swift::ringbuilder':
   part_power     => '18',
-  replicas       => '3',
+  replicas       => '1',
   min_part_hours => 1,
   require        => Class['swift'],
 }

manifests/storage/server.pp

@@ -39,7 +39,7 @@ define swift::storage::server(
 
   $bind_port = $name
 
-  rsync::server::module { "${type}_${name}":
+  rsync::server::module { "${type}":
     path => $devices,
     lock_file => "/var/lock/${type}.lock",
     uid => $owner,

spec/defines/swift_storage_server_spec.rb

@@ -121,7 +121,7 @@ describe 'swift::storage::server' do
           req_params
         end
 
-        it { should contain_rsync__server__module("#{t}_8000").with(
+        it { should contain_rsync__server__module("#{t}").with(
           :path            => '/srv/node',
           :lock_file       => "/var/lock/#{t}.lock",
           :uid             => 'swift',