starlingx/nfv
Code Issues Proposed changes

Fix proxy service start

Browse Source 
The api-proxy.service fails to start because it is not
able to find the /usr/bin/nova-api-proxy. Fix the debian package
to install the python module and the executable.

Story: 2009101
Task: 44055

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: Iee618464179d1429ef02a751af4fe9fc13edc5cb
This commit is contained in:
Charles Short 2021-11-24 09:10:52 -05:00
parent aba5636096
commit d7f5698260
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova-api-proxy/debian/deb_folder/nova-api-proxy.install
View File

@ -2,3 +2,5 @@ etc/init.d/api-proxy
etc/proxy/api-proxy-paste.ini etc/proxy/api-proxy-paste.ini
etc/proxy/nova-api-proxy.conf etc/proxy/nova-api-proxy.conf
lib/systemd/system/api-proxy.service lib/systemd/system/api-proxy.service
usr/lib/python*/dist-packages
usr/bin/nova-api-proxy

5
nova-api-proxy/debian/deb_folder/rules
View File

@ -11,7 +11,7 @@ export UNITDIR=$(ROOT)/lib/systemd/system
%: %:
dh $@ --with=python3 --buildsystem=pybuild dh $@ --with=python3 --buildsystem=pybuild
override_dh_auto_install: override_dh_install:
install -d -m 755 $(UNITDIR) install -d -m 755 $(UNITDIR)
install -p -D -m 644 nova_api_proxy/scripts/api-proxy.service $(UNITDIR)/api-proxy.service install -p -D -m 644 nova_api_proxy/scripts/api-proxy.service $(UNITDIR)/api-proxy.service
install -d -m 755 $(INITDIR) install -d -m 755 $(INITDIR)
@ -19,7 +19,10 @@ override_dh_auto_install:
install -d -m 755 $(PROXYDIR) install -d -m 755 $(PROXYDIR)
install -p -D -m 600 nova_api_proxy/nova-api-proxy.conf $(PROXYDIR)/nova-api-proxy.conf install -p -D -m 600 nova_api_proxy/nova-api-proxy.conf $(PROXYDIR)/nova-api-proxy.conf
install -p -D -m 600 nova_api_proxy/api-proxy-paste.ini $(PROXYDIR)/api-proxy-paste.ini install -p -D -m 600 nova_api_proxy/api-proxy-paste.ini $(PROXYDIR)/api-proxy-paste.ini
python3 setup.py install -f --install-layout=deb \
--root=$(CURDIR)/debian/tmp
python3 setup.py bdist_wheel \ python3 setup.py bdist_wheel \
--universal \ --universal \
-d $(ROOT)/usr/share/python-wheels -d $(ROOT)/usr/share/python-wheels
dh_install