Skip to content
Browse files

changes for swift

  • Loading branch information...
1 parent ea81a71 commit c4b041ab0fd5990a98b80342bca8fbcae4a55531 root committed
View
1 manifests/sitedefs.pp
@@ -196,6 +196,7 @@
class swift-common-node {
include base-node
+ include rcb-common
include swift-common
}
View
16 modules/swift-common/manifests/install.pp
@@ -30,22 +30,6 @@
require => User['swift']
}
- # hack, should ask swift guys to sign packages
- file { '/etc/apt/apt.conf.d/99force-yes':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '600',
- source => 'puppet:///modules/swift-common/apt-force-yes'
- }
-
- apt::source { 'swift':
- location => 'http://crashsite.github.com/swift_debian/lucid/',
- release => 'lucid',
- repos => 'main',
- require => File['/etc/apt/apt.conf.d/99force-yes']
- }
-
package { $swift_common_packages:
ensure => latest,
require => [ Apt::Source['swift'], User['swift'] ]
View
2 modules/swift-storage/templates/account-server.conf.erb
@@ -1,5 +1,5 @@
[DEFAULT]
-bind_ip = 0.0.0.0
+bind_ip = <%= eval("ipaddress_#{swift_storage_net_interface}") %>
workers = 2
[pipeline:main]
View
2 modules/swift-storage/templates/container-server.conf.erb
@@ -1,5 +1,5 @@
[DEFAULT]
-bind_ip = 0.0.0.0
+bind_ip = <%= eval("ipaddress_#{swift_storage_net_interface}") %>
workers = 2
[pipeline:main]
View
2 modules/swift-storage/templates/object-server.conf.erb
@@ -1,5 +1,5 @@
[DEFAULT]
-bind_ip = 0.0.0.0
+bind_ip = <%= eval("ipaddress_#{swift_storage_net_interface}") %>
workers = 2
[pipeline:main]
View
2 modules/swift-storage/templates/rsyncd.conf.erb
@@ -4,7 +4,7 @@ gid = swift
# this should really be bound on an internal-only network
log file = /var/log/rsyncd.log
pid file = /var/run/rsyncd.pid
-address = 0.0.0.0
+address = <%= eval("ipaddress_#{swift_storage_net_interface}") %>
[account]
max connections = 2

0 comments on commit c4b041a

Please sign in to comment.
Something went wrong with that request. Please try again.