[PATCH] [WOK] Add required packages to packages process.
From: Paulo Vital <pvital@linux.vnet.ibm.com> Add to deb and rpm build files all necessary packages required to make available build wok to distros. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 3 ++- contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index ef4e0c2..965d13f 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -15,7 +15,8 @@ Depends: python-cherrypy3 (>= 3.2.0), python-lxml, nginx, python-ldap, - spice-html5 + spice-html5, + python-psutil (>= 0.6.0) Build-Depends: libxslt, openssl, python-lxml diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 30319a9..3f233a7 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-jsonschema >= 1.3.0 Requires: python-lxml Requires: nginx Requires: python-ldap +Requires: python-psutil >= 0.6.0 BuildRequires: libxslt BuildRequires: openssl BuildRequires: python-lxml diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 63bdce3..a9a496b 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: python-ldap Requires: python-lxml Requires: python-xml Requires: nginx +Requires: python-psutil >= 0.6.0 BuildRequires: libxslt-tools BuildRequires: openssl BuildRequires: python-lxml -- 2.4.3
From: Paulo Vital <pvital@linux.vnet.ibm.com> libvirtd is listed as requirement service to start before wokd service. However, wokd is a common web framework that supports many plugins which not necessarily need libvirt to be running. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- contrib/wokd.service.fedora | 2 -- contrib/wokd.sysvinit | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/wokd.service.fedora b/contrib/wokd.service.fedora index 17414d3..a3af29b 100644 --- a/contrib/wokd.service.fedora +++ b/contrib/wokd.service.fedora @@ -1,7 +1,5 @@ [Unit] Description=Wok - Webserver Originated from Kimchi -Requires=libvirtd.service -After=libvirtd.service [Service] Type=simple diff --git a/contrib/wokd.sysvinit b/contrib/wokd.sysvinit index 10680ee..e2c34c7 100644 --- a/contrib/wokd.sysvinit +++ b/contrib/wokd.sysvinit @@ -22,7 +22,7 @@ # ### BEGIN INIT INFO # Provides: wokd -# Required-Start: libvirtd +# Required-Start: # Required-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -- 2.4.3
Hi Paulo, I understand and agree we need to remove libvirtd service as wokd dependency. But in other hand, we need to create a mechanism to allow the plugins specify their own services dependencies - through a configuration file or settings. For example, Kimchi depends on libvirtd service. But other plugins may have different dependencies. Probably, investigate if systemd and upstart already have support to sub services or something like that. Or in worst case, create a script to read the plugins configuration file and make sure the services are up and running when needed on wokd starting up. Regards, Aline Manera On 16/09/2015 16:44, pvital@linux.vnet.ibm.com wrote:
From: Paulo Vital <pvital@linux.vnet.ibm.com>
libvirtd is listed as requirement service to start before wokd service. However, wokd is a common web framework that supports many plugins which not necessarily need libvirt to be running.
Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- contrib/wokd.service.fedora | 2 -- contrib/wokd.sysvinit | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/contrib/wokd.service.fedora b/contrib/wokd.service.fedora index 17414d3..a3af29b 100644 --- a/contrib/wokd.service.fedora +++ b/contrib/wokd.service.fedora @@ -1,7 +1,5 @@ [Unit] Description=Wok - Webserver Originated from Kimchi -Requires=libvirtd.service -After=libvirtd.service
[Service] Type=simple diff --git a/contrib/wokd.sysvinit b/contrib/wokd.sysvinit index 10680ee..e2c34c7 100644 --- a/contrib/wokd.sysvinit +++ b/contrib/wokd.sysvinit @@ -22,7 +22,7 @@ # ### BEGIN INIT INFO # Provides: wokd -# Required-Start: libvirtd +# Required-Start: # Required-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -- 2.4.3
participants (2)
-
Aline Manera -
pvital＠linux.vnet.ibm.com