Fix ring_*_device usage in swift::storage::node
This commit is contained in:
@@ -26,27 +26,24 @@ define swift::storage::node(
|
|||||||
swift::storage::server { "60${name}0":
|
swift::storage::server { "60${name}0":
|
||||||
type => 'object',
|
type => 'object',
|
||||||
}
|
}
|
||||||
ring_object_device { "${storage_local_net_ip}:60${name}0":
|
ring_object_device { "${storage_local_net_ip}:60${name}0/$name":
|
||||||
zone => $zone,
|
zone => $zone,
|
||||||
device_name => $name,
|
|
||||||
weight => $weight,
|
weight => $weight,
|
||||||
}
|
}
|
||||||
|
|
||||||
swift::storage::server { "60${name}1":
|
swift::storage::server { "60${name}1":
|
||||||
type => 'container',
|
type => 'container',
|
||||||
}
|
}
|
||||||
ring_container_device { "${storage_local_net_ip}:60${name}1":
|
ring_container_device { "${storage_local_net_ip}:60${name}1/$name":
|
||||||
zone => $zone,
|
zone => $zone,
|
||||||
device_name => $name,
|
|
||||||
weight => $weight,
|
weight => $weight,
|
||||||
}
|
}
|
||||||
|
|
||||||
swift::storage::server { "60${name}2":
|
swift::storage::server { "60${name}2":
|
||||||
type => 'account',
|
type => 'account',
|
||||||
}
|
}
|
||||||
ring_account_device { "${storage_local_net_ip}:60${name}2":
|
ring_account_device { "${storage_local_net_ip}:60${name}2/$name":
|
||||||
zone => $zone,
|
zone => $zone,
|
||||||
device_name => $name,
|
|
||||||
weight => $weight,
|
weight => $weight,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user