From 2e2cdd7379687405d83e49e1fbef79e473068c24 Mon Sep 17 00:00:00 2001 From: David Sullivan Date: Wed, 5 Sep 2018 11:04:22 -0400 Subject: [PATCH 1/4] Add the starlingx-dashboard package to the iso This will need to be coordinated with the removal of the starlingx-dashboard content from horizon. Change-Id: I160e0edcf2074ca06c824739d329b76367de348d Signed-off-by: David Sullivan Depends-On: https://review.openstack.org/599475 Story: 2002891 Task: 24821 --- centos_iso_image.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 177f0837..32db1582 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -93,6 +93,9 @@ wrs-heat-templates python-django-horizon openstack-dashboard +# stx-dashboard +starlingx-dashboard + # openstack-keystone openstack-keystone From a0be02a79a02838f793ebdf6a15dd8a23e5a7755 Mon Sep 17 00:00:00 2001 From: slin14 Date: Wed, 5 Sep 2018 06:49:39 +0800 Subject: [PATCH 2/4] remove non exist path to avoid error message when build srpm Story: 2003518 Task: 26180 It is to avoid error message like below: " ERROR: (1281): Bad path 'openstack/openstack-swift' in file '/localdisk/designer/slin14/starlingx/cgcs-root/stx/stx-upstream/centos_pkg_dirs' " Change-Id: If1c06480c0adbd93ac8ed8b95c512b7355fd3098 Signed-off-by: slin14 --- centos_pkg_dirs | 1 - 1 file changed, 1 deletion(-) diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 4404bb06..b65bb0a7 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -48,4 +48,3 @@ openstack/python-django-openstack-auth openstack/python-wsme openstack/distributedcloud openstack/distributedcloud-client -openstack/openstack-swift From 3fc7af31b8e5998741fad6b9b97905ce9f4eaedf Mon Sep 17 00:00:00 2001 From: Jack Ding Date: Thu, 6 Sep 2018 10:22:55 -0400 Subject: [PATCH 3/4] Make dcorch-identity-api-proxy script executable The ocf script dcorch-identity-api-proxy was incorrectly set to 644, as a result distributed-cloud-services can not come up. Change permission of the script to 755 so that it is executable. Closes-Bug: 1790950 Change-Id: I68e3067878fa6686dfd19db07018a42f05d92906 Signed-off-by: Jack Ding --- openstack/openstack-ras/centos/openstack-ras.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openstack/openstack-ras/centos/openstack-ras.spec b/openstack/openstack-ras/centos/openstack-ras.spec index 52c41c72..b28608ed 100644 --- a/openstack/openstack-ras/centos/openstack-ras.spec +++ b/openstack/openstack-ras/centos/openstack-ras.spec @@ -28,7 +28,7 @@ OpenStack Resource Agents from Madkiss rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-agent-central rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-evaluator rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-notifier -install -p -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/dcorch-identity-api-proxy +install -p -D -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/dcorch-identity-api-proxy %files %defattr(-,root,root,-) From 55eaec60182484b5c8f11cfef590a03290d487dc Mon Sep 17 00:00:00 2001 From: Eddie Ramirez Date: Mon, 27 Aug 2018 11:31:21 -0700 Subject: [PATCH 4/4] Remove dc_admin from python-horizion dc_admin is now part of the starlingx-dashboard package. This change removes it from the python horizon package. Without this change the horizon package will fail to build. Change-Id: Ia1470ae0b110df3400bc69f15b6a8e6c52bf355e Signed-off-by: David Sullivan Depends-On: https://review.openstack.org/599475 Story: 2002891 Task: 26220 --- openstack/python-horizon/centos/python-django-horizon.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/openstack/python-horizon/centos/python-django-horizon.spec b/openstack/python-horizon/centos/python-django-horizon.spec index 8dc96018..0758282d 100755 --- a/openstack/python-horizon/centos/python-django-horizon.spec +++ b/openstack/python-horizon/centos/python-django-horizon.spec @@ -438,7 +438,6 @@ systemctl daemon-reload >/dev/null 2>&1 || : %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/project %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/settings # WRS -%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/dc_admin %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/__init__.py* %{_datadir}/openstack-dashboard/openstack_dashboard/django_pyscss_fix %{_datadir}/openstack-dashboard/openstack_dashboard/enabled