Fix the rsync modules names

The rsync module name must be only ```$type``` as written in the
documentation [1].

The names with the port added exists but is intended to be used only in
SAIO mode [2] and is only supported if the ```vm_test_mode``` option is
set in ```swift.conf```.

The effect of these shares not being named correctly is seen in the
```swift-{object,account,container}-replicator``` daemons (replication
fails).

[1] http://swift.openstack.org/1.4.6/howto_installmultinode.html#configure-the-storage-nodes
[2] http://swift.openstack.org/1.4.6/development_saio.html

manifests/storage/server.pp

@@ -36,9 +36,9 @@ define swift::storage::server(
 
   $bind_port = $name
 
-  rsync::server::module { "${type}${name}":
+  rsync::server::module { "${type}":
     path => $devices,
-    lock_file => "/var/lock/${type}${name}.lock",
+    lock_file => "/var/lock/${type}.lock",
     uid => $owner,
     gid => $group,
     max_connections => $max_connections,

spec/defines/swift_storage_server_spec.rb

@@ -92,9 +92,9 @@ describe 'swift::storage::server' do
           req_params
         end
 
-        it { should contain_rsync__server__module("#{t}#{title}").with(
+        it { should contain_rsync__server__module("#{t}").with(
           :path            => '/srv/node',
-          :lock_file       => "/var/lock/#{t}#{title}.lock",
+          :lock_file       => "/var/lock/#{t}.lock",
           :uid             => 'swift',
           :gid             => 'swift',
           :max_connections => 25,