stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Swift: cleanup

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-11-02 14:45:21 +01:00
parent b47d10ff97
commit dfa66f9d33
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/object-storage/swift_common.pp
View File

@@ -16,10 +16,11 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
#
# Swift nodes # Swift nodes
#
class os_role_swift { class os_swift_common {
class { 'ssh::server::install': } class { 'ssh::server::install': }

7
roles/object-storage/swift_proxy.pp
View File

@@ -16,12 +16,13 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
#
# Swift Proxy node # Swift Proxy node
#
class os_role_swift_proxy( class os_swift_proxy(
$local_ip = $ipaddress_eth0, $local_ip = $ipaddress_eth0,
) inherits os_role_swift { ) inherits os_swift_common {
class { 'memcached': class { 'memcached':
listen_ip => $local_ip, listen_ip => $local_ip,

8
roles/object-storage/swift_ringbuiler.pp
View File

@@ -16,14 +16,14 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
#
# Swift ring builder node # Swift ring builder node
#
class os_swift_ringbuilder(
class os_role_swift_ringbuilder(
$rsyncd_ipaddress = ipaddress_eth0, $rsyncd_ipaddress = ipaddress_eth0,
$replicas = 3 $replicas = 3
) inherits os_role_swift { ) inherits os_swift_common {
Ring_object_device <<| |>> Ring_object_device <<| |>>
Ring_container_device <<| |>> Ring_container_device <<| |>>

8
roles/object-storage/swift_storage.pp
View File

@@ -16,9 +16,9 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
#
# Swift Storage node # Swift Storage node
#
define set_io_scheduler(){ define set_io_scheduler(){
# TODO: Add it on server boot # TODO: Add it on server boot
@@ -31,14 +31,14 @@ define set_io_scheduler(){
} }
class os_role_swift_storage ( class os_swift_storage (
$local_ip = $ipaddress_eth0, $local_ip = $ipaddress_eth0,
$swift_zone = undef, $swift_zone = undef,
$object_port = '6000', $object_port = '6000',
$container_port = '6001', $container_port = '6001',
$account_port = '6002', $account_port = '6002',
$onloopdevices = false, $onloopdevices = false,
) inherits os_role_swift { ) inherits os_swift_common {
class { 'swift::storage': class { 'swift::storage':
storage_local_net_ip => $local_ip, storage_local_net_ip => $local_ip,