openstack/puppet-swift
Code Issues Proposed changes

Make all local net ips required

Browse Source 
Previously, the binding address for all services
was set to localhost.

This is not going to be a commonly used value
for production deployments.

The defaults for address have been removes b/c
there isn't really a sensible default. This is
something that the users should have to set.
This commit is contained in:
Dan Bode
2012-03-02 20:06:41 -08:00
parent 0e7cb86dcd
commit c7caf05c36
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/proxy.pp
View File

@@ -6,8 +6,6 @@
# [*account_autocreate*] Rather accounts should automatically be created. # [*account_autocreate*] Rather accounts should automatically be created.
# I think this may be tempauth specific # I think this may be tempauth specific
# [*proxy_local_net_ip*] The address that the proxy will bind to. # [*proxy_local_net_ip*] The address that the proxy will bind to.
# Optional. Defaults to 127.0.0.1
# TODO - this default is probably not ideal
# [*proxy_port*] Port that the swift proxy service will bind to. # [*proxy_port*] Port that the swift proxy service will bind to.
# Optional. Defaults to 11211 # Optional. Defaults to 11211
# [*auth_type*] - Type of authorization to use. # [*auth_type*] - Type of authorization to use.
@@ -36,9 +34,9 @@
# #
class swift::proxy( class swift::proxy(
# why did cloudbuilders default this to false? # why did cloudbuilders default this to false?
$proxy_local_net_ip,
$allow_account_management = true, $allow_account_management = true,
$account_autocreate = false, $account_autocreate = false,
$proxy_local_net_ip = '127.0.0.1',
$proxy_port = '11211', $proxy_port = '11211',
$auth_type = 'tempauth', $auth_type = 'tempauth',
$swauth_endpoint = '127.0.0.1', $swauth_endpoint = '127.0.0.1',

2
manifests/storage/server.pp
View File

@@ -5,11 +5,11 @@
# name - is going to be port # name - is going to be port
define swift::storage::server( define swift::storage::server(
$type, $type,
$storage_local_net_ip,
$devices = '/srv/node', $devices = '/srv/node',
$owner = 'swift', $owner = 'swift',
$group = 'swift', $group = 'swift',
$max_connections = 25, $max_connections = 25,
$storage_local_net_ip = '127.0.0.1',
# this parameters needs to be specified after type and name # this parameters needs to be specified after type and name
$config_file_path = "${type}-server/${name}.conf" $config_file_path = "${type}-server/${name}.conf"
) { ) {