diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index dbd259c9..590bb7e2 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -6,8 +6,6 @@
 # [*account_autocreate*] Rather accounts should automatically be created.
 #  I think this may be tempauth specific
 # [*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.
 #   Optional. Defaults to 11211
 # [*auth_type*] - Type of authorization to use.
@@ -36,9 +34,9 @@
 #
 class swift::proxy(
   # why did cloudbuilders default this to false?
+  $proxy_local_net_ip,
   $allow_account_management = true,
   $account_autocreate = false,
-  $proxy_local_net_ip = '127.0.0.1',
   $proxy_port = '11211',
   $auth_type = 'tempauth',
   $swauth_endpoint = '127.0.0.1',
diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index 667e2433..31aa6a6b 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -5,11 +5,11 @@
 #  name - is going to be port
 define swift::storage::server(
   $type,
+  $storage_local_net_ip,
   $devices = '/srv/node',
   $owner = 'swift',
   $group  = 'swift',
   $max_connections = 25,
-  $storage_local_net_ip = '127.0.0.1',
   # this parameters needs to be specified after type and name
   $config_file_path = "${type}-server/${name}.conf"
 ) {