diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-03 19:25:52 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-03 19:25:52 +0000 |
| commit | d74ee0b5a35116c70c7f8e272c03578a2663e3db (patch) | |
| tree | 4d5e61d999fb8e28224951e3a47130fca59de85a | |
| parent | 86102518b83064b5469e4c5639436d456dd6b879 (diff) | |
| download | definitions-d74ee0b5a35116c70c7f8e272c03578a2663e3db.tar.gz | |
Remove remaining uses of ##SWIFT_ADMIN_USER##
Decided this was just needless clutter, should be fine to just run this
under a user named 'swift', if it's not for some reason then we can easily
add this back.
| -rw-r--r-- | openstack/etc/swift/account-server.conf | 2 | ||||
| -rw-r--r-- | openstack/etc/swift/container-server.conf | 2 | ||||
| -rw-r--r-- | openstack/etc/swift/object-server.conf | 2 | ||||
| -rw-r--r-- | openstack/etc/swift/proxy-server.conf | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/openstack/etc/swift/account-server.conf b/openstack/etc/swift/account-server.conf index ce9c58ed..1b66afca 100644 --- a/openstack/etc/swift/account-server.conf +++ b/openstack/etc/swift/account-server.conf @@ -4,7 +4,7 @@ bind_ip = ##MANAGEMENT_INTERFACE_IP_ADDRESS## bind_port = 6002 # bind_timeout = 30 # backlog = 4096 -user = ##SWIFT_ADMIN_USER## +user = swift swift_dir = /etc/swift devices = /srv/node # mount_check = true diff --git a/openstack/etc/swift/container-server.conf b/openstack/etc/swift/container-server.conf index 2a8adaf6..132344a6 100644 --- a/openstack/etc/swift/container-server.conf +++ b/openstack/etc/swift/container-server.conf @@ -4,7 +4,7 @@ bind_ip = ##MANAGEMENT_INTERFACE_IP_ADDRESS## bind_port = 6001 # bind_timeout = 30 # backlog = 4096 -user = ##SWIFT_ADMIN_USER## +user = swift swift_dir = /etc/swift devices = /srv/node # mount_check = true diff --git a/openstack/etc/swift/object-server.conf b/openstack/etc/swift/object-server.conf index ff4017d1..ee98bb12 100644 --- a/openstack/etc/swift/object-server.conf +++ b/openstack/etc/swift/object-server.conf @@ -4,7 +4,7 @@ bind_ip = ##MANAGEMENT_INTERFACE_IP_ADDRESS## bind_port = 6000 # bind_timeout = 30 # backlog = 4096 -user = ##SWIFT_ADMIN_USER## +user = swift swift_dir = /etc/swift devices = /srv/node # mount_check = true diff --git a/openstack/etc/swift/proxy-server.conf b/openstack/etc/swift/proxy-server.conf index bb1f0294..0278a4e2 100644 --- a/openstack/etc/swift/proxy-server.conf +++ b/openstack/etc/swift/proxy-server.conf @@ -4,7 +4,7 @@ bind_port = 8080 # bind_timeout = 30 # backlog = 4096 swift_dir = /etc/swift -user = ##SWIFT_ADMIN_USER## +user = swift # Enables exposing configuration settings via HTTP GET /info. # expose_info = true @@ -276,7 +276,7 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory auth_uri = ##KEYSTONE_INTERNAL_URL## identity_uri = http://controller.##STACK_ID##:35357 admin_tenant_name = service -admin_user = ##SWIFT_ADMIN_USER## +admin_user = swift admin_password = ##SWIFT_ADMIN_PASSWORD## delay_auth_decision = 1 # cache = swift.cache |