Kimchi depends on wok web server so, I suggest to include ginger-base
but keeping wok as well.
We can not rely an a third package to depend on wok to have everything
working.
More comments below:
On 26/11/2015 16:44, chandra(a)linux.vnet.ibm.com wrote:
From: Chandra Shekhar Reddy Potula
<chandra(a)linux.vnet.ibm.com>
Kimchi should be pointing to gingerbase than wok, as plugin kimchi
have dependeny on gingerbase common files (like disks.py)
Taken care of README.md to shows png files correctly when browse it
---
src/wok/plugins/kimchi/contrib/DEBIAN/control.in | 2 +-
src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in | 2 +-
src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in | 2 +-
src/wok/plugins/kimchi/docs/README.md | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
b/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
index ba528a1..7a111ed 100644
--- a/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
+++ b/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
@@ -3,7 +3,7 @@ Version: @PACKAGE_VERSION@
Section: base
Priority: optional
Architecture: all
-Depends: wok,
+Depends: ginger-base,
python-imaging,
python-configobj,
websockify,
diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
index d1e0046..457bdb4 100644
--- a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
+++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
@@ -7,7 +7,7 @@ BuildArch: noarch
Group: System Environment/Base
License: LGPL/ASL2
Source0: %{name}-%{version}.tar.gz
-Requires: wok
+Requires: ginger-base
Requires: qemu-kvm
Requires: gettext
Requires: libvirt
diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
index 640ade9..80ca4bc 100644
--- a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
+++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
@@ -7,7 +7,7 @@ BuildArch: noarch
Group: System Environment/Base
License: LGPL/ASL2
Source0: %{name}-%{version}.tar.gz
-Requires: wok
+Requires: ginger-base
Requires: kvm
Requires: gettext-tools
Requires: libvirt
diff --git a/src/wok/plugins/kimchi/docs/README.md
b/src/wok/plugins/kimchi/docs/README.md
index 23db018..628d3b9 100644
--- a/src/wok/plugins/kimchi/docs/README.md
+++ b/src/wok/plugins/kimchi/docs/README.md
@@ -48,7 +48,7 @@ Install Dependencies
**For fedora and RHEL:**
- $ sudo yum install wok libvirt-python libvirt \
+ $ sudo yum install ginger-base libvirt-python libvirt \
libvirt-daemon-config-network python-imaging \
qemu-kvm python-ethtool sos python-ipaddr \
nfs-utils iscsi-initiator-utils pyparted \
@@ -76,7 +76,7 @@ channel at RHN Classic or Red Hat Satellite.
**For Ubuntu (Debian-based):**
- $ sudo apt-get install wok python-imaging python-configobj websockify \
+ $ sudo apt-get install ginger-base python-imaging python-configobj websockify \
novnc python-libvirt libvirt-bin nfs-common \
qemu-kvm python-parted python-ethtool sosreport \
xsltproc python-ipaddr python-lxml open-iscsi \
@@ -88,7 +88,7 @@ channel at RHN Classic or Red Hat Satellite.
**For openSUSE:**
- $ sudo zypper install wok libvirt-python libvirt \
+ $ sudo zypper install ginger-base libvirt-python libvirt \
libvirt-daemon-config-network python-imaging \
kvm python-ethtool python-ipaddr nfs-client \
open-iscsi python-parted python-libguestfs \
The commands in the README are used when running for local source code.
So user can copy/paste it and have all the dependencies installed.
In that case, as wok and gingerbase are not part of any official distro
repository we should not include them here.
As they will have its own build/install process.
@@ -178,13 +178,13 @@ Usage
Connect your browser to
https://localhost:8001. You should see a screen like:
-![Wok Login Screen](/docs/kimchi-login.png)
+![Wok Login Screen](docs/kimchi-login.png)
Wok uses PAM to authenticate users so you can log in with the same username
and password that you would use to log in to the machine itself. Once logged in
you will see a screen like:
-![Kimchi Guest View](/docs/kimchi-guest.png)
+![Kimchi Guest View](docs/kimchi-guest.png)
This shows you the list of running guests including a live screenshot of
the guest session. You can use the action buttons to shutdown the guests
@@ -198,7 +198,7 @@ top navigation bar.
The template screen looks like:
-![Kimchi Template View](/docs/kimchi-templates.png)
+![Kimchi Template View](docs/kimchi-templates.png)
From this view, you can change the parameters of a template or create a
new template using the "+" button in the upper right corner.