openstack/rpm-packaging
Code Issues Proposed changes

Don't exclude python bytecode files in dashboards

Browse Source 
If these files are excluded from the rpm install then modified bytecode
files will remamin on disk on uninstall and cause unexpected behavior in
horizon. Remove these from the exclude list.

Change-Id: Ib03f38285c3de377d4c71de4ed7feb1bfa919a35
This commit is contained in:
Colleen Murphy
2019-01-09 15:08:18 +01:00
committed by Colleen Murphy
parent 4486903d13
commit bee43edca5
7 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/freezer-web-ui/freezer-web-ui.spec.j2
View File

@@ -59,14 +59,12 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%files
%doc ChangeLog README.rst
%license LICENSE
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py*
%files -n {{ py2pkg('horizon-plugin-freezer-ui') }}
%doc README.rst
%license LICENSE
%{python2_sitelib}/disaster_recovery
%{python2_sitelib}/freezer_web_ui-*.egg-info
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyc
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyo
%changelog

4
openstack/heat-dashboard/heat-dashboard.spec.j2
View File

@@ -91,7 +91,7 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py compress
%files
%doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py*
%{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/_1699_orchestration_settings.py*
%files -n {{ py2pkg('horizon-plugin-heat-ui') }}
@@ -99,8 +99,6 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py compress
%license LICENSE
%{python2_sitelib}/heat_dashboard/
%{python2_sitelib}/heat_dashboard-*.egg-info
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyc
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyo
%exclude %{python_sitelib}/heat_dashboard/test*
%files test

4
openstack/karbor-dashboard/karbor-dashboard.spec.j2
View File

@@ -66,14 +66,12 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%files
%doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py*
%files -n {{ py2pkg('horizon-plugin-karbor-ui') }}
%doc README.rst
%license LICENSE
%{python2_sitelib}/karbor_dashboard
%{python2_sitelib}/karbor_dashboard-*.egg-info
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyc
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyo
%changelog

4
openstack/monasca-ui/monasca-ui.spec.j2
View File

@@ -78,7 +78,7 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collectstatic --noinput --clear > /dev/null"
%files
%{http_dashboard_dir}/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.py
%{http_dashboard_dir}/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.py*
%{http_dashboard_dir}/openstack_dashboard/conf/monitoring_policy.json
%license LICENSE
%doc ChangeLog README.rst
@@ -94,7 +94,5 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%doc README.rst
%{python2_sitelib}/monitoring
%{python2_sitelib}/monasca_ui-*.egg-info
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.pyc
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.pyo
%changelog

4
openstack/murano-dashboard/murano-dashboard.spec.j2
View File

@@ -74,7 +74,7 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%files
%doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py*
%{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/_50_murano.py.example
%{http_dashboard_dir}/openstack_dashboard/conf/murano_policy.json
@@ -83,7 +83,5 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%license LICENSE
%{python2_sitelib}/muranodashboard
%{python2_sitelib}/murano_dashboard-*.egg-info
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyc
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyo
%changelog

4
openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2
View File

@@ -98,7 +98,7 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%files
%doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py*
%{http_dashboard_dir}/openstack_dashboard/conf/neutron-fwaas-policy.json
%files -n {{ py2pkg('horizon-plugin-neutron-fwaas-ui') }}
@@ -106,8 +106,6 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%license LICENSE
%{python2_sitelib}/neutron_fwaas_dashboard/
%{python2_sitelib}/neutron_fwaas_dashboard-*.egg-info
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyc
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyo
%exclude %{python_sitelib}/neutron_fwaas_dashboard/test*
%files test

4
openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2
View File

@@ -90,15 +90,13 @@ su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collects
%files
%doc ChangeLog CONTRIBUTING.rst README.rst
%license LICENSE
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py
%{http_dashboard_dir}/openstack_dashboard/enabled/*.py*
%files -n {{ py2pkg('horizon-plugin-neutron-vpnaas-ui') }}
%doc README.rst
%license LICENSE
%{python2_sitelib}/neutron_vpnaas_dashboard/
%{python2_sitelib}/neutron_vpnaas_dashboard-*.egg-info
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyc
%exclude %{http_dashboard_dir}/openstack_dashboard/enabled/*.pyo
%exclude %{python_sitelib}/neutron_vpnaas_dashboard/test*
%files test