starlingx/upstream
Code Issues Proposed changes

Merge remote-tracking branch 'origin/master' into f/centos75

Browse Source 
Change-Id: I1bfff0f1ed17e4f5d8fa8a5ac905f22475982a79
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2018-09-14 11:04:14 -05:00
commit d981ba0b3a
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
centos_iso_image.inc
View File

@ -93,6 +93,9 @@ wrs-heat-templates
python-django-horizon python-django-horizon
openstack-dashboard openstack-dashboard
# stx-dashboard
starlingx-dashboard
# openstack-keystone # openstack-keystone
openstack-keystone openstack-keystone

1
centos_pkg_dirs
View File

@ -48,4 +48,3 @@ openstack/python-django-openstack-auth
openstack/python-wsme openstack/python-wsme
openstack/distributedcloud openstack/distributedcloud
openstack/distributedcloud-client openstack/distributedcloud-client
openstack/openstack-swift

2
openstack/openstack-ras/centos/openstack-ras.spec
View File

@ -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-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-evaluator
rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-notifier 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 %files
%defattr(-,root,root,-) %defattr(-,root,root,-)

1
openstack/python-horizon/centos/python-django-horizon.spec
View File

@ -438,7 +438,6 @@ systemctl daemon-reload >/dev/null 2>&1 || :
%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/project %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/project
%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/settings %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/settings
# WRS # WRS
%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/dc_admin
%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/__init__.py* %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/__init__.py*
%{_datadir}/openstack-dashboard/openstack_dashboard/django_pyscss_fix %{_datadir}/openstack-dashboard/openstack_dashboard/django_pyscss_fix
%{_datadir}/openstack-dashboard/openstack_dashboard/enabled %{_datadir}/openstack-dashboard/openstack_dashboard/enabled