packages/openstack-keystone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 修复require问题

Browse Source 
From: @xiyuanwang
Reviewed-by: @joec88
Signed-off-by: @joec88
This commit is contained in:
openeuler-ci-bot 2021-02-20 15:06:01 +08:00 committed by Gitee
commit 72be7416ed
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack-keystone.defaultconf
View File

@ -1,2 +0,0 @@
[DEFAULT]
log_dir=/var/log/keystone

11
openstack-keystone.spec
View File

@ -1,13 +1,12 @@
Name: openstack-keystone Name: openstack-keystone
Version: 18.0.0 Version: 18.0.0
Release: 1 Release: 2
Summary: OpenStack Identity Service Summary: OpenStack Identity Service
License: ASL 2.0 License: ASL 2.0
URL: https://launchpad.net/keystone URL: https://launchpad.net/keystone
Source0: keystone-18.0.0.tar.gz Source0: keystone-18.0.0.tar.gz
Source1: openstack-keystone.logrotate Source1: openstack-keystone.logrotate
Source2: openstack-keystone.sysctl Source2: openstack-keystone.sysctl
Source3: openstack-keystone.defaultconf
BuildRequires: openstack-macros BuildRequires: openstack-macros
BuildRequires: python3-flask BuildRequires: python3-flask
@ -88,7 +87,7 @@ Requires: python3-memcached
Requires: python3-pytz Requires: python3-pytz
Requires: python3-scrypt Requires: python3-scrypt
Requires: python3-six Requires: python3-six
Requires: python3-migrate Requires: python3-sqlalchemy-migrate
Requires: python3-stevedore Requires: python3-stevedore
%description -n python3-keystone %description -n python3-keystone
@ -122,7 +121,6 @@ install -d -m 750 %{buildroot}%{_localstatedir}/{lib,log,cache}/keystone
install -d -m 755 %{buildroot}%{_sysconfdir}/keystone/keystone.conf.d/ install -d -m 755 %{buildroot}%{_sysconfdir}/keystone/keystone.conf.d/
# default dir for fernet tokens # default dir for fernet tokens
install -d -m 750 %{buildroot}%{_sysconfdir}/keystone/credential-keys/ install -d -m 750 %{buildroot}%{_sysconfdir}/keystone/credential-keys/
install -D -m 644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/keystone.conf
install -p -D -m 640 etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf install -p -D -m 640 etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf
install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/keystone/logging.conf install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/keystone/logging.conf
install -p -D -m 640 etc/keystone.policy.yaml %{buildroot}%{_sysconfdir}/keystone/keystone.policy.yaml install -p -D -m 640 etc/keystone.policy.yaml %{buildroot}%{_sysconfdir}/keystone/keystone.policy.yaml
@ -142,7 +140,6 @@ install -p -D -m 644 httpd/wsgi-keystone.conf %{buildroot}%{_datadir}/keystone/
exit 0 exit 0
%post %post
%tmpfiles_create %{_tmpfilesdir}/keystone.conf
%sysctl_apply openstack-keystone.conf %sysctl_apply openstack-keystone.conf
%files %files
@ -152,7 +149,6 @@ exit 0
%{_bindir}/keystone-wsgi-public %{_bindir}/keystone-wsgi-public
%{_bindir}/keystone-manage %{_bindir}/keystone-manage
%{_bindir}/keystone-status %{_bindir}/keystone-status
%_tmpfilesdir/keystone.conf
%dir %{_datadir}/keystone %dir %{_datadir}/keystone
%attr(0755, root, root) %{_datadir}/keystone/sample_data.sh %attr(0755, root, root) %{_datadir}/keystone/sample_data.sh
%attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf %attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf
@ -177,5 +173,8 @@ exit 0
%exclude %{python3_sitelib}/keystone/tests %exclude %{python3_sitelib}/keystone/tests
%changelog %changelog
* Sat Feb 20 2021 wangxiyuan <wangxiyuan1007@gmail.org>
- Fix Requires Issue and drop useless file
* Wed Feb 3 2021 wangxiyuan <wangxiyuan1007@gmail.org> * Wed Feb 3 2021 wangxiyuan <wangxiyuan1007@gmail.org>
- Support OpenStack Victoria release - Support OpenStack Victoria release