diff --git a/openstack/freezer-web-ui/freezer-web-ui.spec.j2 b/openstack/freezer-web-ui/freezer-web-ui.spec.j2 index 24dc40c61..c1729cc30 100644 --- a/openstack/freezer-web-ui/freezer-web-ui.spec.j2 +++ b/openstack/freezer-web-ui/freezer-web-ui.spec.j2 @@ -45,7 +45,7 @@ The Freezer UI Horizon plugin adds Freezer panel to the OpenStack dashboard. %py3_install install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a disaster_recovery/enabled/_50*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a disaster_recovery/enabled/_50*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ %fdupes %{buildroot}%{python2_sitelib} %fdupes %{buildroot}%{http_dashboard_dir} diff --git a/openstack/monasca-ui/monasca-ui.spec.j2 b/openstack/monasca-ui/monasca-ui.spec.j2 index 3a2120603..577c46f53 100644 --- a/openstack/monasca-ui/monasca-ui.spec.j2 +++ b/openstack/monasca-ui/monasca-ui.spec.j2 @@ -60,7 +60,7 @@ panel's Alarms tab links to when generating drilldown links for alarms. install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ -cp -a monitoring/enabled/_50_admin_add_monitoring_panel.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a monitoring/enabled/_50_admin_add_monitoring_panel.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ cp -a monitoring/conf/monitoring_policy.json %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ %if 0%{?suse_version} install -m 0755 -d %{buildroot}%{_datadir}/grafana/public/dashboards/ diff --git a/openstack/murano-dashboard/murano-dashboard.spec.j2 b/openstack/murano-dashboard/murano-dashboard.spec.j2 index 10f67179b..2d778cf12 100644 --- a/openstack/murano-dashboard/murano-dashboard.spec.j2 +++ b/openstack/murano-dashboard/murano-dashboard.spec.j2 @@ -56,7 +56,7 @@ The Murano UI Horizon plugin adds Murano panel to the OpenStack dashboard. %py3_install install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a muranodashboard/local/enabled/*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a muranodashboard/local/enabled/*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/ cp -a muranodashboard/local/local_settings.d/_50_murano.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/_50_murano.py.example install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ @@ -73,7 +73,10 @@ su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collect %files %doc ChangeLog README.rst %license LICENSE -%{http_dashboard_dir}/openstack_dashboard/enabled/*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_5*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_6*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_7*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_8*.py* %{http_dashboard_dir}/openstack_dashboard/local/local_settings.d/_50_murano.py.example %{http_dashboard_dir}/openstack_dashboard/conf/murano_policy.json diff --git a/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 b/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 index ee18fc107..f2595d5c0 100644 --- a/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 +++ b/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 @@ -82,7 +82,7 @@ PYTHONPATH=%{http_dashboard_dir} python3 manage.py test neutron_fwaas_dashboard %{py3_install} install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a neutron_fwaas_dashboard/enabled/*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a neutron_fwaas_dashboard/enabled/_70*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ cp -a etc/neutron-fwaas-policy.json %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ @@ -98,7 +98,7 @@ su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collect %files %doc ChangeLog CONTRIBUTING.rst README.rst %license LICENSE -%{http_dashboard_dir}/openstack_dashboard/enabled/*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_70*.py* %{http_dashboard_dir}/openstack_dashboard/conf/neutron-fwaas-policy.json %files -n {{ py3('horizon-plugin-neutron-fwaas-ui') }} diff --git a/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 b/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 index 3d7a685af..4343f9553 100644 --- a/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 +++ b/openstack/neutron-vpnaas-dashboard/neutron-vpnaas-dashboard.spec.j2 @@ -74,7 +74,7 @@ PYTHONPATH=%{http_dashboard_dir} python3 manage.py test neutron_vpnaas_dashboard %{py3_install} install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a neutron_vpnaas_dashboard/enabled/*.py %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ +cp -a neutron_vpnaas_dashboard/enabled/_71*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ %fdupes %{buildroot}%{python3_sitelib} %fdupes %{buildroot}%{http_dashboard_dir} @@ -88,7 +88,7 @@ su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collect %files %doc ChangeLog CONTRIBUTING.rst README.rst %license LICENSE -%{http_dashboard_dir}/openstack_dashboard/enabled/*.py* +%{http_dashboard_dir}/openstack_dashboard/enabled/_71*.py* %files -n {{ py2pkg('horizon-plugin-neutron-vpnaas-ui') }} %doc README.rst