summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2012-09-14 19:20:30 (GMT)
committerDerek Higgins <derekh@redhat.com>2012-09-14 23:01:16 (GMT)
commit61f8545c153a01169a586873ad7056cbb5c5de5d (patch)
tree60ba92e966d7248c42abe312d9c21b8196762696
parent4b757da59ba514c3d9087200aa7f0a660fe331a3 (diff)
downloadopenstack-swift-61f8545c153a01169a586873ad7056cbb5c5de5d.zip
openstack-swift-61f8545c153a01169a586873ad7056cbb5c5de5d.tar.gz
openstack-swift-61f8545c153a01169a586873ad7056cbb5c5de5d.tar.xz
Adding config files
-rw-r--r--account-server.conf16
-rw-r--r--container-server.conf18
-rw-r--r--object-server.conf16
-rw-r--r--openstack-swift.spec23
-rw-r--r--proxy-server.conf39
-rw-r--r--swift.conf2
6 files changed, 112 insertions, 2 deletions
diff --git a/account-server.conf b/account-server.conf
new file mode 100644
index 0000000..9fea6e1
--- /dev/null
+++ b/account-server.conf
@@ -0,0 +1,16 @@
+[DEFAULT]
+bind_ip = 127.0.0.1
+bind_port = 6002
+workers = 2
+
+[pipeline:main]
+pipeline = account-server
+
+[app:account-server]
+use = egg:swift#account
+
+[account-replicator]
+
+[account-auditor]
+
+[account-reaper]
diff --git a/container-server.conf b/container-server.conf
new file mode 100644
index 0000000..ac96702
--- /dev/null
+++ b/container-server.conf
@@ -0,0 +1,18 @@
+[DEFAULT]
+bind_ip = 127.0.0.1
+bind_port = 6001
+workers = 2
+
+[pipeline:main]
+pipeline = container-server
+
+[app:container-server]
+use = egg:swift#container
+
+[container-replicator]
+
+[container-updater]
+
+[container-auditor]
+
+[container-sync]
diff --git a/object-server.conf b/object-server.conf
new file mode 100644
index 0000000..5015d61
--- /dev/null
+++ b/object-server.conf
@@ -0,0 +1,16 @@
+[DEFAULT]
+bind_ip = 127.0.0.1
+bind_port = 6000
+workers = 3
+
+[pipeline:main]
+pipeline = object-server
+
+[app:object-server]
+use = egg:swift#object
+
+[object-replicator]
+
+[object-updater]
+
+[object-auditor]
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 3268406..5d30e28 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -6,7 +6,7 @@
Name: openstack-swift
Version: 1.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OpenStack Object Storage (swift)
Group: Development/Languages
@@ -16,12 +16,17 @@ Source0: http://launchpad.net/swift/folsom/%{version}/+download/swift-%
#Source0: http://tarballs.openstack.org/swift/swift-%{version}~%{snaptag}.tar.gz
Source2: %{name}-account.service
Source21: %{name}-account@.service
+Source22: account-server.conf
Source4: %{name}-container.service
Source41: %{name}-container@.service
+Source42: container-server.conf
Source5: %{name}-object.service
Source51: %{name}-object@.service
+Source52: object-server.conf
Source6: %{name}-proxy.service
+Source61: proxy-server.conf
Source20: %{name}.tmpfs
+Source7: swift.conf
BuildRoot: %{_tmppath}/swift-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -173,6 +178,12 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/swift/account-server
install -d -m 755 %{buildroot}%{_sysconfdir}/swift/container-server
install -d -m 755 %{buildroot}%{_sysconfdir}/swift/object-server
install -d -m 755 %{buildroot}%{_sysconfdir}/swift/proxy-server
+# Config files
+install -p -D -m 660 %{SOURCE22} %{buildroot}%{_sysconfdir}/swift/account-server.conf
+install -p -D -m 660 %{SOURCE42} %{buildroot}%{_sysconfdir}/swift/container-server.conf
+install -p -D -m 660 %{SOURCE52} %{buildroot}%{_sysconfdir}/swift/object-server.conf
+install -p -D -m 660 %{SOURCE61} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf
+install -p -D -m 660 %{SOURCE7} %{buildroot}%{_sysconfdir}/swift/swift.conf
# Install pid directory
install -d -m 755 %{buildroot}%{_localstatedir}/run/swift
install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/account-server
@@ -335,6 +346,7 @@ fi
%{_mandir}/man1/swift-ring-builder.1*
%config(noreplace) %{_sysconfdir}/tmpfiles.d/openstack-swift.conf
%dir %{_sysconfdir}/swift
+%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/swift.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift
%dir %{python_sitelib}/swift
%{_bindir}/swift-account-audit
@@ -366,6 +378,7 @@ fi
%dir %{_unitdir}/%{name}-account.service
%dir %{_unitdir}/%{name}-account@.service
%dir %{_sysconfdir}/swift/account-server
+%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/account-server.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/account-server
%{_bindir}/swift-account-auditor
%{_bindir}/swift-account-reaper
@@ -385,6 +398,7 @@ fi
%dir %{_unitdir}/%{name}-container.service
%dir %{_unitdir}/%{name}-container@.service
%dir %{_sysconfdir}/swift/container-server
+%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/container-server.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/container-server
%{_bindir}/swift-container-auditor
%{_bindir}/swift-container-server
@@ -407,6 +421,7 @@ fi
%dir %{_unitdir}/%{name}-object.service
%dir %{_unitdir}/%{name}-object@.service
%dir %{_sysconfdir}/swift/object-server
+%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/object-server.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/object-server
%{_bindir}/swift-object-auditor
%{_bindir}/swift-object-info
@@ -422,6 +437,7 @@ fi
%{_mandir}/man1/swift-proxy-server.1*
%dir %{_unitdir}/%{name}-proxy.service
%dir %{_sysconfdir}/swift/proxy-server
+%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/proxy-server.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/proxy-server
%{_bindir}/swift-proxy-server
%{python_sitelib}/swift/proxy
@@ -431,7 +447,10 @@ fi
%doc LICENSE doc/build/html
%changelog
-* Thu Sep 16 2012 Derek Higgins <derekh@redhat.com> 1.7.0-1
+* Fri Sep 14 2012 Derek Higgins <derekh@redhat.com> 1.7.0-2
+- Adding config files
+
+* Thu Sep 13 2012 Derek Higgins <derekh@redhat.com> 1.7.0-1
- Update to 1.7.0
* Mon Aug 13 2012 Alan Pevec <apevec@redhat.com> 1.6.0-1
diff --git a/proxy-server.conf b/proxy-server.conf
new file mode 100644
index 0000000..3e4b88a
--- /dev/null
+++ b/proxy-server.conf
@@ -0,0 +1,39 @@
+[DEFAULT]
+bind_port = 8080
+workers = 8
+user = swift
+
+[pipeline:main]
+pipeline = healthcheck cache authtoken keystone proxy-server
+
+[app:proxy-server]
+use = egg:swift#proxy
+allow_account_management = true
+account_autocreate = true
+
+[filter:cache]
+use = egg:swift#memcache
+memcache_servers = 127.0.0.1:11211
+
+[filter:catch_errors]
+use = egg:swift#catch_errors
+
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
+[filter:keystone]
+paste.filter_factory = keystone.middleware.swift_auth:filter_factory
+operator_roles = admin, SwiftOperator
+is_admin = true
+cache = swift.cache
+
+[filter:authtoken]
+paste.filter_factory = keystone.middleware.auth_token:filter_factory
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+auth_host = 127.0.0.1
+auth_port = 35357
+auth_protocol = http
+signing_dir = /tmp/keystone-signing-swift
+
diff --git a/swift.conf b/swift.conf
new file mode 100644
index 0000000..adbd96f
--- /dev/null
+++ b/swift.conf
@@ -0,0 +1,2 @@
+[swift-hash]
+swift_hash_path_suffix = %SWIFT_HASH_PATH_SUFFIX%