!13 [sync] PR-12: 【轻量级 PR】：Update swift conf

Merge pull request !13 from openeuler-sync-bot/sync-pr12-N/A-to-openEuler-20.03-LTS-SP3
Update swift conf
2021-12-21 07:00:03 +00:00 · 2021-12-21 14:43:56 +08:00 · 2021-11-12 01:29:40 +00:00 · 2021-11-05 03:32:21 +00:00 · 2021-08-30 06:36:40 +00:00 · 2021-08-30 11:15:45 +08:00
8 changed files with 196 additions and 198 deletions
--- a/account-server.conf
+++ b/account-server.conf
@ -1,24 +1,27 @@
 [DEFAULT]
-
-# Make sure your swift-ring-builder arguments match the bind_ip and bind_port.
-# You almost certainly do not want to listen just on loopback unless testing.
-# However, you want to keep port 6202 if SElinux is enabled.
 bind_ip = 127.0.0.1
 bind_port = 6202
-
 workers = 2
+user = swift
+swift_dir = /etc/swift
+devices = /srv/node
+mount_check = True

 [pipeline:main]
-pipeline = recon account-server
+pipeline = healthcheck recon account-server
+
+[filter:healthcheck]
+use = egg:swift#healthcheck

 [filter:recon]
 use = egg:swift#recon
+recon_cache_path = /var/cache/swift

 [app:account-server]
 use = egg:swift#account

-[account-replicator]
-
 [account-auditor]

 [account-reaper]
+
+[account-replicator]
--- a/container-server.conf
+++ b/container-server.conf
@ -1,29 +1,27 @@
 [DEFAULT]
-
-# Make sure your swift-ring-builder arguments match the bind_ip and bind_port.
-# You almost certainly do not want to listen just on loopback unless testing.
-# However, you want to keep port 6201 if SElinux is enabled.
 bind_ip = 127.0.0.1
 bind_port = 6201
-
 workers = 2
+user = swift
+swift_dir = /etc/swift
+devices = /srv/node
+mount_check = True

 [pipeline:main]
-pipeline = recon container-server
+pipeline = healthcheck recon container-server
+
+[filter:healthcheck]
+use = egg:swift#healthcheck

 [filter:recon]
 use = egg:swift#recon
+recon_cache_path = /var/cache/swift

 [app:container-server]
 use = egg:swift#container

+[container-auditor]
+
 [container-replicator]

 [container-updater]
-
-[container-auditor]
-
-[container-sync]
-
-[container-sharder]
-
--- a/object-server.conf
+++ b/object-server.conf
@ -1,26 +1,28 @@
 [DEFAULT]
-
-# Make sure your swift-ring-builder arguments match the bind_ip and bind_port.
-# You almost certainly do not want to listen just on loopback unless testing.
-# However, you want to keep port 6200 if SElinux is enabled.
 bind_ip = 127.0.0.1
 bind_port = 6200
-
-workers = 3
+workers = 2
+user = swift
+swift_dir = /etc/swift
+devices = /srv/node
+mount_check = True

 [pipeline:main]
-pipeline = recon object-server
+pipeline = healthcheck recon object-server
+
+[filter:healthcheck]
+use = egg:swift#healthcheck

 [filter:recon]
 use = egg:swift#recon
+recon_cache_path = /var/cache/swift
+recon_lock_path = /var/lock

 [app:object-server]
 use = egg:swift#object

+[object-auditor]
+
 [object-replicator]

 [object-updater]
-
-[object-auditor]
-
-[object-reconstructor]
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@ -15,7 +15,7 @@ inexpensive commodity hard drives and servers can be used in lieu of more \
 expensive equipment.

 Name:             openstack-swift
-Version:          2.27.0
+Version:          2.23.3
 Release:          2
 Summary:          OpenStack Object Storage
 License:          ASL 2.0
@ -77,53 +77,25 @@ BuildRequires:    git-core
 BuildRequires:    /usr/bin/pathfix.py

 BuildRequires:    systemd
-Obsoletes:        openstack-swift-auth  <= 1.4.0

 # Required to compile translation files
 BuildRequires:    python3-babel
 # Required to build docs: doxygen invokes actual code and its imports
 BuildRequires:    python3-keystoneclient

-Requires:         python3-swift = %{version}-%{release}
+Requires:         openstack-swift-proxy
+Requires:         openstack-swift-account
+Requires:         openstack-swift-container
+Requires:         openstack-swift-object

 %description
 %{common_desc}

-%package -n       python3-swift
-Summary:          Python libraries for the OpenStack Object Storage (Swift)
-
-Provides:         openstack-swift = %{version}-%{release}
-Obsoletes:        openstack-swift < %{version}-%{release}
-%{?python_provide:%python_provide python3-swift}
-
-Requires:         python3-eventlet >= 0.25.0
-Requires:         python3-greenlet >= 0.3.2
-Requires:         python3-pyeclib >= 1.3.1
-Requires:         python3-cryptography >= 2.0.2
-Requires:         python3-oslo-config >= 5.1.0
-Requires:         python3-castellan >= 0.7.0
-Requires:         python3-requests >= 2.14.2
-Requires:         python3-six >= 1.10.0
-
-Requires:         python3-paste-deploy >= 1.3.3
-Requires:         python3-xattr >= 0.4
-Requires:         python3-netifaces >= 0.8
-Requires:         python3-lxml >= 3.4.1
-
-%{?systemd_ordering} 
-
-Requires(pre):    shadow-utils
-
-%description -n   python3-swift
-%{common_desc}
-
-This package contains the %{name} Python library.
-
 %package          account
 Summary:          Account services for Swift

-Requires:         python3-swift = %{version}-%{release}
-Requires:         rsync >= 3.0
+Requires:         openstack-swift-common = %{version}-%{release}
+Requires:         rsync

 %description      account
 %{common_desc}
@ -133,8 +105,8 @@ This package contains the %{name} account server.
 %package          container
 Summary:          Container services for Swift

-Requires:         python3-swift = %{version}-%{release}
-Requires:         rsync >= 3.0
+Requires:         openstack-swift-common = %{version}-%{release}
+Requires:         rsync

 %description      container
 %{common_desc}
@ -144,8 +116,8 @@ This package contains the %{name} container server.
 %package          object
 Summary:          Object services for Swift

-Requires:         python3-swift = %{version}-%{release}
-Requires:         rsync >= 3.0
+Requires:         openstack-swift-common = %{version}-%{release}
+Requires:         rsync

 %description      object
 %{common_desc}
@ -155,16 +127,51 @@ This package contains the %{name} object server.
 %package          proxy
 Summary:          A proxy server for Swift

-Requires:         python3-swift = %{version}-%{release}
+Requires:         openstack-swift-common = %{version}-%{release}
 Requires:         python3-keystoneclient
 Requires:         python3-keystonemiddleware
-Requires:         python3-ceilometermiddleware

 %description      proxy
 %{common_desc}

 This package contains the %{name} proxy server.

+%package          common
+Summary:          Common files for Swift service
+Requires:         python3-swift = %{version}-%{release}
+
+%description      common
+%{common_desc}
+
+This package contains the common files for swift service.
+
+%package -n       python3-swift
+Summary:          Python libraries for the OpenStack Object Storage (Swift)
+%{?python_provide:%python_provide python3-swift}
+
+Requires:         python3-eventlet
+Requires:         python3-greenlet
+Requires:         python3-pyeclib
+Requires:         python3-cryptography
+Requires:         python3-oslo-config
+Requires:         python3-castellan
+Requires:         python3-requests
+Requires:         python3-six
+
+Requires:         python3-paste-deploy
+Requires:         python3-xattr
+Requires:         python3-netifaces
+Requires:         python3-lxml
+
+%{?systemd_ordering} 
+
+Requires(pre):    shadow-utils
+
+%description -n   python3-swift
+%{common_desc}
+
+This package contains the %{name} Python library.
+
 %package -n python3-swift-tests
 Summary:          Swift tests
 Requires:         python3-swift = %{version}-%{release}
@ -180,7 +187,7 @@ This package contains the %{name} test files.
 %package doc
 Summary:          Documentation for %{name}

-BuildRequires:    python3-sphinx >= 1.0
+BuildRequires:    python3-sphinx
 BuildRequires:    python3-openstackdocstheme
 BuildRequires:    python3-sphinxcontrib-svg2pdfconverter
 # Required for generating docs (otherwise py-modindex.html is missing)
@ -406,63 +413,9 @@ exit 0
 %post -n python3-swift
 /usr/bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2>/dev/null || :

-%files -n python3-swift -f swift.lang
+%files
 %defattr(-,root,root,-)
 %license LICENSE
-%doc README.rst
-%doc etc/*-sample
-%{_mandir}/man5/dispersion.conf.5*
-%{_mandir}/man1/swift-account-audit.1*
-%{_mandir}/man1/swift-ring-builder-analyzer.1*
-%{_mandir}/man1/swift-config.1*
-%{_mandir}/man1/swift-dispersion-populate.1*
-%{_mandir}/man1/swift-dispersion-report.1*
-%{_mandir}/man1/swift-drive-audit.1*
-%{_mandir}/man1/swift-form-signature.1*
-%{_mandir}/man1/swift-get-nodes.1*
-%{_mandir}/man1/swift-init.1*
-%{_mandir}/man1/swift-oldies.1.*
-%{_mandir}/man1/swift-orphans.1*
-%{_mandir}/man1/swift-recon.1*
-%{_mandir}/man1/swift-recon-cron.1*
-%{_mandir}/man1/swift-ring-builder.1*
-%{_mandir}/man1/swift-ring-composer.1*
-%{_mandir}/man5/swift.conf.5*
-%{_mandir}/man5/container-sync-realms.conf.5*
-%{_tmpfilesdir}/openstack-swift.conf
-%dir %attr(0755, swift, swift)%{_sysconfdir}/swift
-%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/swift.conf
-%config(noreplace) %{_sysconfdir}/rsyslog.d/openstack-swift.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-swift
-%dir %{_localstatedir}/log/swift
-%dir %attr(0755, swift, root) %{_localstatedir}/run/swift
-%dir %attr(0755, swift, swift) %{_localstatedir}/cache/swift
-%dir %attr(0755, swift, root) %{_sharedstatedir}/swift
-%dir %{python3_sitelib}/swift
-%{_bindir}/swift-account-audit
-%{_bindir}/swift-config
-%{_bindir}/swift-dispersion-populate
-%{_bindir}/swift-dispersion-report
-%{_bindir}/swift-drive-audit
-%{_bindir}/swift-form-signature
-%{_bindir}/swift-get-nodes
-%{_bindir}/swift-init
-%{_bindir}/swift-manage-shard-ranges
-%{_bindir}/swift-oldies
-%{_bindir}/swift-orphans
-%{_bindir}/swift-recon
-%{_bindir}/swift-recon-cron
-%{_bindir}/swift-reconciler-enqueue
-%{_bindir}/swift-ring-builder
-%{_bindir}/swift-ring-builder-analyzer
-%{_bindir}/swift-ring-composer
-%{python3_sitelib}/swift
-%{python3_sitelib}/swift-%{upstream_version}-py?.*.egg-info
-%exclude %{python3_sitelib}/swift/test
-
-%files -n python3-swift-tests
-%license LICENSE
-%{python3_sitelib}/swift/test

 %files account
 %defattr(-,root,root,-)
@ -557,6 +510,68 @@ exit 0
 %{_bindir}/swift-object-expirer
 %{_bindir}/swift-proxy-server

+%files common
+%defattr(-,root,root,-)
+%license LICENSE
+%doc README.rst
+%doc etc/*-sample
+%{_mandir}/man5/dispersion.conf.5*
+%{_mandir}/man1/swift-account-audit.1*
+%{_mandir}/man1/swift-ring-builder-analyzer.1*
+%{_mandir}/man1/swift-config.1*
+%{_mandir}/man1/swift-dispersion-populate.1*
+%{_mandir}/man1/swift-dispersion-report.1*
+%{_mandir}/man1/swift-drive-audit.1*
+%{_mandir}/man1/swift-form-signature.1*
+%{_mandir}/man1/swift-get-nodes.1*
+%{_mandir}/man1/swift-init.1*
+%{_mandir}/man1/swift-oldies.1.*
+%{_mandir}/man1/swift-orphans.1*
+%{_mandir}/man1/swift-recon.1*
+%{_mandir}/man1/swift-recon-cron.1*
+%{_mandir}/man1/swift-ring-builder.1*
+%{_mandir}/man1/swift-ring-composer.1*
+%{_mandir}/man5/swift.conf.5*
+%{_mandir}/man5/container-sync-realms.conf.5*
+%{_tmpfilesdir}/openstack-swift.conf
+%dir %attr(0755, swift, swift)%{_sysconfdir}/swift
+%config(noreplace) %attr(640, root, swift) %{_sysconfdir}/swift/swift.conf
+%config(noreplace) %{_sysconfdir}/rsyslog.d/openstack-swift.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-swift
+%dir %{_localstatedir}/log/swift
+%dir %attr(0755, swift, root) %{_localstatedir}/run/swift
+%dir %attr(0755, swift, swift) %{_localstatedir}/cache/swift
+%dir %attr(0755, swift, root) %{_sharedstatedir}/swift
+%dir %{python3_sitelib}/swift
+%{_bindir}/swift-account-audit
+%{_bindir}/swift-config
+%{_bindir}/swift-dispersion-populate
+%{_bindir}/swift-dispersion-report
+%{_bindir}/swift-drive-audit
+%{_bindir}/swift-form-signature
+%{_bindir}/swift-get-nodes
+%{_bindir}/swift-init
+%{_bindir}/swift-manage-shard-ranges
+%{_bindir}/swift-oldies
+%{_bindir}/swift-orphans
+%{_bindir}/swift-recon
+%{_bindir}/swift-recon-cron
+%{_bindir}/swift-reconciler-enqueue
+%{_bindir}/swift-ring-builder
+%{_bindir}/swift-ring-builder-analyzer
+%{_bindir}/swift-ring-composer
+
+%files -n python3-swift -f swift.lang
+%defattr(-,root,root,-)
+%license LICENSE
+%{python3_sitelib}/swift
+%{python3_sitelib}/swift-%{upstream_version}-py?.*.egg-info
+%exclude %{python3_sitelib}/swift/test
+
+%files -n python3-swift-tests
+%license LICENSE
+%{python3_sitelib}/swift/test
+
 %if 0%{?with_doc}
 %files doc
 %defattr(-,root,root,-)
@ -565,8 +580,8 @@ exit 0
 %endif

 %changelog
-* Sat Jul 31 2021 OpenStack_SIG <openstack@openeuler.org> - 2.27.0-2
- Delete the epoch
+* Tue Dec 21 2021 huangtianhua <huangtianhua@huawei.com> - 2.23.3-2
+- Adds the missing sections to config files

-* Sat Jul 31 2021 OpenStack_SIG <openstack@openeuler.org> - 2.27.0-1
- openEuler build release
+* Fri Nov 05 2021 wangixyuan <wangxiyuan1007@gmail.com> - 2.23.3-1
+- Support OpenStack Train release 
--- a/proxy-server.conf
+++ b/proxy-server.conf
@ -1,66 +1,58 @@
 [DEFAULT]
 bind_port = 8080
-workers = 8
+workers = 2
 user = swift
+swift_dir = /etc/swift

 [pipeline:main]
-# Our traditional pipeline produces a cluster without any authentication,
-# open to access by any client. This is almost always a very bad idea, and
-# it's overridden by OSP Director, so it is likely to go away some time
-# after Newton.
-pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit copy container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
-
-# This sample pipeline uses tempauth and is used for SAIO dev work and
-# testing. See below for a pipeline using keystone.
-#pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit tempauth copy container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
-
-# The following pipeline shows keystone integration. Comment out the one
-# above and uncomment this one. Additional steps for integrating keystone are
-# covered further below in the filter sections for authtoken and keystoneauth.
-#pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk tempurl ratelimit authtoken keystone copy container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache container_sync bulk ratelimit authtoken keystoneauth container-quotas account-quotas slo dlo versioned_writes proxy-logging proxy-server

 [app:proxy-server]
 use = egg:swift#proxy
-allow_account_management = true
-account_autocreate = true
-
-# This is a sample used for functional tests in SAIO. Contains well-known
-# passwords.
-#[filter:tempauth]
-#use = egg:swift#tempauth
-#user_admin_admin = admin .admin .reseller_admin
-#user_test_tester = testing .admin
-#user_test2_tester2 = testing2 .admin
-#user_test_tester3 = testing3
-#user_test5_tester5 = testing5 service
-
-[filter:healthcheck]
-use = egg:swift#healthcheck
-
-[filter:cache]
-use = egg:swift#memcache
-memcache_servers = 127.0.0.1:11211
-
-[filter:ratelimit]
-use = egg:swift#ratelimit
+account_autocreate = True

 [filter:catch_errors]
 use = egg:swift#catch_errors

-[filter:tempurl]
-use = egg:swift#tempurl
+[filter:gatekeeper]
+use = egg:swift#gatekeeper
+
+[filter:healthcheck]
+use = egg:swift#healthcheck

 [filter:proxy-logging]
 use = egg:swift#proxy_logging

+[filter:cache]
+use = egg:swift#memcache
+memcache_servers = controller:11211
+
+[filter:container_sync]
+use = egg:swift#container_sync
+
 [filter:bulk]
 use = egg:swift#bulk

-[filter:slo]
-use = egg:swift#slo
+[filter:ratelimit]
+use = egg:swift#ratelimit

-[filter:dlo]
-use = egg:swift#dlo
+[filter:authtoken]
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
+www_authenticate_uri = http://controller:5000
+auth_url = http://controller:5000
+memcached_servers = controller:11211
+auth_type = password
+project_domain_id = default
+user_domain_id = default
+project_name = service
+username = swift
+# 根据用户创建的keystoneswift用户，自行修改密码
+password = swift
+delay_auth_decision = True
+
+[filter:keystoneauth]
+use = egg:swift#keystoneauth
+operator_roles = admin,user

 [filter:container-quotas]
 use = egg:swift#container_quotas
@ -68,28 +60,11 @@ use = egg:swift#container_quotas
 [filter:account-quotas]
 use = egg:swift#account_quotas

-[filter:gatekeeper]
-use = egg:swift#gatekeeper
+[filter:slo]
+use = egg:swift#slo

-[filter:container_sync]
-use = egg:swift#container_sync
+[filter:dlo]
+use = egg:swift#dlo

 [filter:versioned_writes]
 use = egg:swift#versioned_writes
-
-[filter:copy]
-use = egg:swift#copy
-object_post_as_copy = false
-
-[filter:keystone]
-use = egg:swift#keystoneauth
-operator_roles = admin, SwiftOperator
-cache = swift.cache
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-project_name = %SERVICE_TENANT_NAME%
-username = %SERVICE_USER%
-password = %SERVICE_PASSWORD%
-auth_url = http://127.0.0.1:5000
-signing_dir = /tmp/keystone-signing-swift
--- a/swift-2.23.3.tar.gz
+++ b/swift-2.23.3.tar.gz
--- a/swift-2.27.0.tar.gz
+++ b/swift-2.27.0.tar.gz
--- a/swift.conf
+++ b/swift.conf
@ -1,2 +1,7 @@
 [swift-hash]
-swift_hash_path_suffix = %SWIFT_HASH_PATH_SUFFIX%
+swift_hash_path_suffix = test-hash
+swift_hash_path_prefix = test-hash
+
+[storage-policy:0]
+name = Policy-0
+default = yes
Author	SHA1	Message	Date
openeuler-ci-bot	950f697355	!13 [sync] PR-12: 【轻量级 PR】：Update swift conf Merge pull request !13 from openeuler-sync-bot/sync-pr12-N/A-to-openEuler-20.03-LTS-SP3	2021-12-21 07:00:03 +00:00
huangtianhua	cbf16d95f5	Update swift conf (cherry picked from commit 4b5d1d749679a2d2f876a1c36ae2c5756313ca4f)	2021-12-21 14:43:56 +08:00
openeuler-ci-bot	687e03df45	!10 Train support From: @xiyuanwang Reviewed-by: @huangtianhua Signed-off-by: @huangtianhua	2021-11-12 01:29:40 +00:00
wangxiyuan	f7d26652ec	Train support	2021-11-05 03:32:21 +00:00
openeuler-ci-bot	56bbce7a61	!8 Update swift service config file content From: @xiyuanwang Reviewed-by: @huangtianhua Signed-off-by: @huangtianhua	2021-08-30 06:36:40 +00:00
wangxiyuan	29c08383b0	Update swift service config file content	2021-08-30 11:15:45 +08:00
openeuler-ci-bot	e0368132f4	!6 [Lightweight PR]: Nit Fix From: @xiyuanwang Reviewed-by: @huangtianhua Signed-off-by: @huangtianhua	2021-08-24 11:05:05 +00:00
王玺源	c3cb13a2ce	Nit Fix	2021-08-24 10:00:38 +00:00
openeuler-ci-bot	f87cc93698	!4 Correct structure From: @xiyuanwang Reviewed-by: @huangtianhua Signed-off-by: @huangtianhua	2021-08-24 03:23:45 +00:00
wangxiyuan	9377d79243	Correct structure	2021-08-24 11:21:34 +08:00