!36 【轻量级 PR】：Fix systemd unit error

From: @xiyuanwang 
Reviewed-by: @huangtianhua 
Signed-off-by: @huangtianhua

openstack-dashboard-systemd.conf

@@ -1,6 +1,6 @@
 [Service]
-ExecStartPre=/usr/bin/python /usr/share/openstack-dashboard/manage.py collectstatic --noinput --clear -v0
+ExecStartPre=/usr/bin/python3 /usr/share/openstack-dashboard/manage.py collectstatic --noinput --clear -v0
-ExecStartPre=/usr/bin/python /usr/share/openstack-dashboard/manage.py compress --force -v0
+ExecStartPre=/usr/bin/python3 /usr/share/openstack-dashboard/manage.py compress --force -v0
 TimeoutStartSec=5min
 
 [Unit]

openstack-dashboard.spec

@@ -1,7 +1,7 @@
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 Name:       openstack-dashboard
-Version:    19.2.0
+Version:    16.2.2
-Release:    3
+Release:    5
 Summary:    OpenStack Dashboard (Horizon)
 License:    Apache-2.0 and BSD
 URL:        http://horizon.openstack.org/
@@ -12,7 +12,7 @@ Source3:    openstack-dashboard-logrotate.conf
 BuildArch:  noarch
 BuildRequires:   python3-devel
 BuildRequires:   python3-setuptools
-BuildRequires:   python3-pbr >= 2.0.0
+BuildRequires:   python3-pbr
 BuildRequires:   git-core
 BuildRequires:   gettext
 # for checks:
@@ -45,10 +45,10 @@ for the OpenStack Dashboard (Horizon).
 Summary:    Openstack web user interface reference implementation
 
 BuildRequires: python3-django-debreach
-BuildRequires: python3-django-compressor >= 2.0
+BuildRequires: python3-django-compressor
-BuildRequires: python3-django-pyscss >= 2.0.2
+BuildRequires: python3-django-pyscss
 BuildRequires: python3-XStatic
-BuildRequires: python3-XStatic-Angular >= 1.5.8.0
+BuildRequires: python3-XStatic-Angular
 BuildRequires: python3-XStatic-Angular-Bootstrap
 BuildRequires: python3-XStatic-Angular-Schema-Form
 BuildRequires: python3-XStatic-D3
@@ -65,9 +65,9 @@ BuildRequires: python3-XStatic-roboto-fontface
 BuildRequires: python3-XStatic-mdi
 BuildRequires: python3-XStatic-objectpath
 BuildRequires: python3-XStatic-tv4
-# bootstrap-scss requires at least python-scss >= 1.2.1
+# bootstrap-scss requires at least python-scss
-BuildRequires: python3-scss >= 1.3.5
+BuildRequires: python3-scss
-BuildRequires: fontawesome-fonts-web >= 4.1.0
+BuildRequires: fontawesome-fonts-web
 BuildRequires: python3-oslo-concurrency
 BuildRequires: python3-oslo-config
 BuildRequires: python3-oslo-i18n
@@ -93,60 +93,60 @@ BuildRequires: python3-pint
 BuildRequires: python3-memcached
 BuildRequires: python3-glanceclient
 BuildRequires: python3-keystoneclient
-BuildRequires: python3-novaclient >= 9.1.0
+BuildRequires: python3-novaclient
 BuildRequires: python3-neutronclient
 BuildRequires: python3-cinderclient
 BuildRequires: python3-swiftclient
 BuildRequires: python3-pytest
 
 Requires:   python3-iso8601
-Requires:   python3-glanceclient >= 2.8.0
+Requires:   python3-glanceclient
-Requires:   python3-keystoneclient >= 3.22.0
+Requires:   python3-keystoneclient
-Requires:   python3-keystoneauth1 >= 3.4.0
+Requires:   python3-keystoneauth1
-Requires:   python3-novaclient >= 9.1.0
+Requires:   python3-novaclient
-Requires:   python3-neutronclient >= 6.7.0
+Requires:   python3-neutronclient
-Requires:   python3-cinderclient >= 5.0.0
+Requires:   python3-cinderclient
-Requires:   python3-swiftclient >= 3.2.0
+Requires:   python3-swiftclient
 Requires:   python3-netaddr
-Requires:   python3-osprofiler >= 2.3.0
+Requires:   python3-osprofiler
-Requires:   python3-django-pyscss >= 2.0.2
+Requires:   python3-django-pyscss
 Requires:   python3-XStatic
-Requires:   python3-XStatic-Angular >= 1.5.8.0
+Requires:   python3-XStatic-Angular
 Requires:   python3-XStatic-Angular-Bootstrap
 Requires:   python3-XStatic-Angular-Schema-Form
 Requires:   python3-XStatic-D3
 Requires:   python3-XStatic-Font-Awesome
 Requires:   python3-XStatic-JSEncrypt
 Requires:   python3-XStatic-Jasmine
-Requires:   python3-XStatic-Bootstrap-SCSS >= 3.3.7.1
+Requires:   python3-XStatic-Bootstrap-SCSS
 Requires:   python3-XStatic-termjs
 Requires:   python3-XStatic-smart-table
 Requires:   python3-XStatic-Angular-Gettext
 Requires:   python3-XStatic-Angular-FileUpload
 Requires:   python3-XStatic-bootswatch
-Requires:   python3-XStatic-roboto-fontface >= 0.5.0.0
+Requires:   python3-XStatic-roboto-fontface
 Requires:   python3-XStatic-mdi
 Requires:   python3-XStatic-objectpath
 Requires:   python3-XStatic-tv4
 Requires:   python3-django-debreach
-Requires:   python3-scss >= 1.3.7
+Requires:   python3-scss
-Requires:   fontawesome-fonts-web >= 4.1.0
+Requires:   fontawesome-fonts-web
-Requires:   python3-oslo-concurrency >= 3.26.0
+Requires:   python3-oslo-concurrency
-Requires:   python3-oslo-config >= 5.2.0
+Requires:   python3-oslo-config
-Requires:   python3-oslo-i18n >= 3.15.3
+Requires:   python3-oslo-i18n
-Requires:   python3-oslo-serialization >= 2.18.0
+Requires:   python3-oslo-serialization
-Requires:   python3-oslo-utils >= 3.40.0
+Requires:   python3-oslo-utils
-Requires:   python3-oslo-upgradecheck >= 0.1.1
+Requires:   python3-oslo-upgradecheck
-Requires:   python3-requests >= 2.14.2
+Requires:   python3-requests
-Requires:   python3-oslo-policy >= 3.2.0
+Requires:   python3-oslo-policy
 Requires:   python3-babel
 Requires:   python3-futurist
 Requires:   openssl
 Requires:   logrotate
 Requires:   python3-mod_wsgi
 Requires:   python3-django-appconf
-Requires:   python3-pymongo >= 3.0.2
+Requires:   python3-pymongo
-Requires:   python3-semantic_version >= 2.3.1
+Requires:   python3-semantic_version
 Requires:   python3-XStatic-jQuery
 Requires:   python3-XStatic-Hogan
 Requires:   python3-XStatic-JQuery-Migrate
@@ -157,9 +157,10 @@ Requires:   python3-XStatic-Spin
 Requires:   python3-XStatic-jquery-ui
 Requires:   python3-XStatic-Bootstrap-Datepicker
 Requires:   python3-XStatic-Angular-lrdragndrop
-Requires:   python3-yaml >= 3.12
+Requires:   python3-yaml
 Requires:   python3-memcached
-Requires:   python3-debtcollector >= 1.2.0
+Requires:   python3-debtcollector
+Requires:   python3-pint
 
 Provides:   python-horizon
 %description -n python3-horizon
@@ -171,6 +172,7 @@ This package contains the python library.
 
 %prep
 %autosetup -n horizon-%{upstream_version} -S git
+sed -i 's/Django<2.1,/Django/' requirements.txt
 
 # customize default settings
 # WAS [PATCH] disable debug, move web root
@@ -239,9 +241,9 @@ find %{buildroot} -name djangojs.po -exec rm '{}' \;
 mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/local_settings
 ln -s ../../../../..%{_sysconfdir}/openstack-dashboard/local_settings %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
 
-mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/default_policies %{buildroot}%{_sysconfdir}/openstack-dashboard
+mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/*.json %{buildroot}%{_sysconfdir}/openstack-dashboard
-mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/*.yaml %{buildroot}%{_sysconfdir}/openstack-dashboard
 mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/nova_policy.d %{buildroot}%{_sysconfdir}/openstack-dashboard
+rm -rf %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/wsgi
 
 %find_lang django --all-name
 
@@ -323,13 +325,11 @@ systemctl daemon-reload >/dev/null 2>&1 || :
 %dir %attr(0750, apache, apache) %{_var}/log/horizon
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/local_settings
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/default_policies/*.yaml
+%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.json
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/default_policies/README.txt
+%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/keystone_policy.json
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.yaml
+%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.json
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/keystone_policy.yaml
+%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/glance_policy.json
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.yaml
+%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/neutron_policy.json
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/glance_policy.yaml
-%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/neutron_policy.yaml
 %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.d/api-extensions.yaml
 %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/logrotate.d/openstack-dashboard
 %attr(755,root,root) %dir %{_unitdir}/httpd.service.d
@@ -345,20 +345,17 @@ systemctl daemon-reload >/dev/null 2>&1 || :
 %{python3_sitelib}/openstack_auth
 
 %changelog
-* Sat Aug 28 2021 liusheng <liusheng2048@gmail.com> 19.2.0-3
+* Mon Feb 21 2022 wangxiyuan <wangxiyuan1007@gmail.com> - 16.2.2-5
-- Fix wrong httpd configuration
+- Fix systemd unit error
 
-* Thu Aug 12 2021 liusheng <liusheng2048@gmail.com> 19.2.0-2
+* Tue Nov 23 2021 huangtianhua <huangtianhua@huawei.com> - 16.2.2-4
-- Fix wrong requires of python3-oslo-config
+- Removes Django<2.1 constrains
 
-* Thu Aug 12 2021 liusheng <liusheng2048@gmail.com> 19.2.0-1
+* Fri Nov 19 2021 huangtianhua <huangtianhua@huawei.com> - 16.2.2-3
-- Upgrade to version 19.2.0 (OpenStack Wallaby)
+- Adds python3-pint as requires
 
-* Thu Feb 25 2021 wangxiyuan <wangxiyuan1007@gmail.com>
+* Fri Nov 19 2021 lijiawei <ljw1101.vip@gmail.com> - 16.2.2-2
-- Fix httpd config error
+- Fix the file path
 
-* Sat Feb 20 2021 huangtianhua <huangtianhua223@gmail.com>
+* Fri Nov 05 2021 lijiawei <ljw1101.vip@gmail.com> - 16.2.2-1
-- Change to use python-enmerkar instead of django-babel
+- Support OpenStack Train release
-
-* Tus Feb 09 2021 wangxiyuan <wangxiyuan1007@gmail.com>
-- Init the first openstack victoria release