starlingx/fault
Code Issues Proposed changes

add migrate.cfg to wheel package to install image

Browse Source 
Change-Id: If2d256aa56a9b278f7fecae76d1a1efd3a6a0444
Story: 2004008
Task: 30682
Signed-off-by: Sun Austin <austin.sun@intel.com>
This commit is contained in:
Sun Austin 2019-05-01 22:14:02 +08:00
parent 2441aededf
commit 53ddc3285a
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fm-rest-api/centos/fm-rest-api.spec
View File

@ -65,9 +65,6 @@ install -p -D -m 755 scripts/fm-api %{buildroot}%{local_initddir}/fm-api
install -d -m 755 %{buildroot}%{local_etc_pmond} install -d -m 755 %{buildroot}%{local_etc_pmond}
install -p -D -m 644 fm-api-pmond.conf %{buildroot}%{local_etc_pmond}/fm-api.conf install -p -D -m 644 fm-api-pmond.conf %{buildroot}%{local_etc_pmond}/fm-api.conf
# Install sql migration stuff that wasn't installed by setup.py
install -m 640 fm/db/sqlalchemy/migrate_repo/migrate.cfg %{buildroot}%{pythonroot}/fm/db/sqlalchemy/migrate_repo/migrate.cfg
# install default config files # install default config files
cd %{_builddir}/%{name}-%{version} && oslo-config-generator --config-file fm/config-generator.conf --output-file %{_builddir}/%{name}-%{version}/fm.conf.sample cd %{_builddir}/%{name}-%{version} && oslo-config-generator --config-file fm/config-generator.conf --output-file %{_builddir}/%{name}-%{version}/fm.conf.sample
install -p -D -m 644 %{_builddir}/%{name}-%{version}/fm.conf.sample %{buildroot}%{_sysconfdir}/fm/fm.conf install -p -D -m 644 %{_builddir}/%{name}-%{version}/fm.conf.sample %{buildroot}%{_sysconfdir}/fm/fm.conf

2
fm-rest-api/fm/setup.py
View File

@ -29,7 +29,7 @@ setup(
platforms=['any'], platforms=['any'],
provides=['fm'], provides=['fm'],
packages=find_packages(), packages=find_packages(),
package_data={}, package_data={'fm': ['db/sqlalchemy/migrate_repo/migrate.cfg'], },
include_package_data=False, include_package_data=False,
entry_points={ entry_points={
'fm.database.migration_backend': [ 'fm.database.migration_backend': [