From d7f56982608a9489c1669942f1055461eac82757 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Wed, 24 Nov 2021 09:10:52 -0500 Subject: [PATCH] Fix proxy service start 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 Change-Id: Iee618464179d1429ef02a751af4fe9fc13edc5cb --- nova-api-proxy/debian/deb_folder/nova-api-proxy.install | 2 ++ nova-api-proxy/debian/deb_folder/rules | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nova-api-proxy/debian/deb_folder/nova-api-proxy.install b/nova-api-proxy/debian/deb_folder/nova-api-proxy.install index 1ea9b970..3527e563 100644 --- a/nova-api-proxy/debian/deb_folder/nova-api-proxy.install +++ b/nova-api-proxy/debian/deb_folder/nova-api-proxy.install @@ -2,3 +2,5 @@ etc/init.d/api-proxy etc/proxy/api-proxy-paste.ini etc/proxy/nova-api-proxy.conf lib/systemd/system/api-proxy.service +usr/lib/python*/dist-packages +usr/bin/nova-api-proxy diff --git a/nova-api-proxy/debian/deb_folder/rules b/nova-api-proxy/debian/deb_folder/rules index ced00783..5fa2ed67 100644 --- a/nova-api-proxy/debian/deb_folder/rules +++ b/nova-api-proxy/debian/deb_folder/rules @@ -11,7 +11,7 @@ export UNITDIR=$(ROOT)/lib/systemd/system %: dh $@ --with=python3 --buildsystem=pybuild -override_dh_auto_install: +override_dh_install: install -d -m 755 $(UNITDIR) install -p -D -m 644 nova_api_proxy/scripts/api-proxy.service $(UNITDIR)/api-proxy.service install -d -m 755 $(INITDIR) @@ -19,7 +19,10 @@ override_dh_auto_install: 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/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 \ --universal \ -d $(ROOT)/usr/share/python-wheels + dh_install