From 3a324b66e1e9c601b627d7aa35e1548ead35aee0 Mon Sep 17 00:00:00 2001 From: "chron.xie" Date: Tue, 7 Apr 2020 15:36:03 +0800 Subject: [PATCH] update upstream project for horizon train upgrade. This change is based on openstack stable/train. Story: 2007502 Task: 39268 Depends-on: https://review.opendev.org/#/c/716954/1 Change-Id: Ifd5adbcbd7ccd124c27b859619f21b3a7cd55de7 Signed-off-by: Xie Quqiang --- openstack/python-horizon/centos/build_srpm.data | 2 +- openstack/python-horizon/centos/python-django-horizon.spec | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/openstack/python-horizon/centos/build_srpm.data b/openstack/python-horizon/centos/build_srpm.data index 72eef175..fc9e6e1e 100755 --- a/openstack/python-horizon/centos/build_srpm.data +++ b/openstack/python-horizon/centos/build_srpm.data @@ -1,5 +1,5 @@ TAR_NAME=horizon SRC_DIR="$CGCS_BASE/git/horizon" COPY_LIST="$FILES_BASE/*" -TIS_BASE_SRCREV=a8df389822aaeaa29aded7e8c6614b51748ab914 +TIS_BASE_SRCREV=817ee34d5a57409dc9945e6151a43d6747e5cc02 TIS_PATCH_VER=2 diff --git a/openstack/python-horizon/centos/python-django-horizon.spec b/openstack/python-horizon/centos/python-django-horizon.spec index 496cb2e6..a412d2ed 100755 --- a/openstack/python-horizon/centos/python-django-horizon.spec +++ b/openstack/python-horizon/centos/python-django-horizon.spec @@ -372,7 +372,6 @@ mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_s #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/*.json %{buildroot}%{_sysconfdir}/openstack-dashboard -mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/cinder_policy.d %{buildroot}%{_sysconfdir}/openstack-dashboard mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/nova_policy.d %{buildroot}%{_sysconfdir}/openstack-dashboard @@ -475,7 +474,6 @@ systemctl daemon-reload >/dev/null 2>&1 || : %{_datadir}/openstack-dashboard/openstack_dashboard/.eslintrc %dir %attr(0750, root, apache) %{_sysconfdir}/openstack-dashboard -%dir %attr(0750, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.d/ %dir %attr(0750, apache, apache) %{_sharedstatedir}/openstack-dashboard %dir %attr(0750, apache, apache) %{_var}/log/horizon %config(noreplace) %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf @@ -485,7 +483,6 @@ systemctl daemon-reload >/dev/null 2>&1 || : %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/nova_policy.json %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/glance_policy.json %config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/neutron_policy.json -%config(noreplace) %attr(0640, root, apache) %{_sysconfdir}/openstack-dashboard/cinder_policy.d/consistencygroup.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