7:31 a.m.
Those options are related to Kimchi and should not be on Wok server
configuration.
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
docs/wokd.8.in | 57 ----------------------------------------------------
src/wok.conf.in | 7 -------
src/wok/config.py.in | 2 --
src/wokd.in | 10 +--------
4 files changed, 1 insertion(+), 75 deletions(-)
diff --git a/docs/wokd.8.in b/docs/wokd.8.in
index d715e87..c7a6f3f 100644
--- a/docs/wokd.8.in
+++ b/docs/wokd.8.in
@@ -7,7 +7,6 @@ Kimchi \- HTML5 based management tool for KVM
[\fB--ssl-port\fP \fIssl_port\fP] [\fB--cherrypy_port\fP \fIcherrypy_port\fP]
[\fB--log-level\fP \fIlog_level\fP] [\fB--access-log\fP \fIaccess_log\fP]
[\fB--error-log\fP \fIerror_log\fP] [\fB--environment\fP \fIenvironment\fP]
-[\fB--federation\fP \fIfederation\fP] [\fB--test\fP]
.SH DESCRIPTION
\fBKimchi\fP is an HTML5 based management tool for KVM. It is designed to make
it as easy as possible to get started with KVM and create your first guest.
@@ -41,67 +40,11 @@ Specify the access log location where kimchi should create the access
log file.
\fB\-\-environment\fP [\fIdevelopment\fP | \fIproduction\fP]
Specify the running environment of kimchi server. Check cherrypy documentation for more
details (default \fIproduction\fP).
.TP
-\fB\-\-federation\fP [\fIon\fP | \fIoff\fP]
Register and discover Kimchi peers in the same network using OpenSLP. Check
below the \fBFEDERATION\fP section for more details (default \fIoff\fP).
.TP
\fB\-\-test\fP
Run kimchi on a mock version that does not affect the system. For testing proposals.
-.SH FEDERATION
-Federation feature is a mechanism to discover Kimchi peers in the same network.
-It uses OpenSLP tool (http://www.openslp.org/) to register and find the Kimchi
-servers.
-
-By default this feature is disabled on Kimchi as it is not critical for KVM
-virtualization and requires additional software installation.
-
-To enable it, do the following:
-
-1. Install OpenSLP server package
-
-2. OpenSLP uses port 427 (UDP) and port 427 (TCP) so make sure to open those
- ports in your firewall configuration
-
- For system using firewalld, do:
- sudo firewall-cmd \-\-permanent \-\-add-port=427/udp
- sudo firewall-cmd \-\-permanent \-\-add-port=427/tcp
- sudo firewall-cmd \-\-reload
-
- For openSUSE systems, do:
- sudo /sbin/SuSEfirewall2 open EXT TCP 427
- sudo /sbin/SuSEfirewall2 open EXT UDP 427
-
- For system using iptables, do:
- sudo iptables \-A INPUT \-p tcp \-\-dport 427 \-j ACCEPT
- sudo iptables \-A INPUT \-p udp \-\-dport 427 \-j ACCEPT
-
-3. In addition to the OpenSLP ports, you also need to allow multicast in the
- firewall configuration
-
- For system using firewalld, do:
- sudo firewall-cmd \-\-direct \-\-add-rule ipv4 filter INPUT 0 \-s <subnet> \-j
ACCEPT
-
- For openSUSE systems, do:
- Add the subnet to the trusted networks listed on FW_TRUSTED_NETS in
- /etc/sysconfig/SuSEfirewall2 file.
- Make sure to restart /sbin/SuSEfirewall2 after modifying /etc/sysconfig/SuSEfirewall2
-
- For system using iptables, do:
- sudo iptables \-A INPUT \-s <subnet> \-j ACCEPT
-
-4. Start slpd service and make sure it is up while running Kimchi
- sudo service slpd start
-
-5. Enable federation on Kimchi by editing the /etc/kimchi/kimchi.conf file:
-
- federation = on
-
-6. Then start Kimchi service
- sudo service kimchid start
-
-The Kimchi server will be registered on OpenSLP on server starting up and will
-be found by other Kimchi peers (with federation feature enabled) in the same
-network.
.SH LICENCE
.br
Kimchi is distributed pursuant to the terms of two different licenses.
diff --git a/src/wok.conf.in b/src/wok.conf.in
index 7406671..7d479d3 100644
--- a/src/wok.conf.in
+++ b/src/wok.conf.in
@@ -29,16 +29,9 @@
# Running environment of the server
#environment = production
-# Federation feature: register Wok server on openSLP and discover peers
-# in the same network. Check README-federation for more details.
-#federation = off
-
# Max request body size in KB, default value is 4GB
#max_body_size = 4 * 1024 * 1024
-# Automatically create ISO pool on server start up
-#create_iso_pool = true
-
[logging]
# Log directory
#log_dir = @localstatedir@/log/wok
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index e84be5f..c6b1db2 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -236,8 +236,6 @@ def _get_config():
config.set("server", "ssl_cert", "")
config.set("server", "ssl_key", "")
config.set("server", "environment", "production")
- config.set("server", "federation", "off")
- config.set("server", "create_iso_pool", "true")
config.set('server', 'max_body_size', '4*1024*1024')
config.add_section("authentication")
config.set("authentication", "method", "pam")
diff --git a/src/wokd.in b/src/wokd.in
index 1108445..733338a 100644
--- a/src/wokd.in
+++ b/src/wokd.in
@@ -2,7 +2,7 @@
#
# Project Wok
#
-# Copyright IBM, Corp. 2013-2015
+# Copyright IBM, Corp. 2013-2016
#
# Code derived from Project Kimchi
#
@@ -49,8 +49,6 @@ def main(options):
cherrypy_port = config.config.get("server", "cherrypy_port")
websockets_port = config.config.get("server", "websockets_port")
runningEnv = config.config.get("server", "environment")
- federation = config.config.get("server", "federation")
- isopool = config.config.get("server", "create_iso_pool")
logDir = config.config.get("logging", "log_dir")
logLevel = config.config.get("logging", "log_level")
@@ -76,12 +74,6 @@ def main(options):
help="Error log file")
parser.add_option('--environment', default=runningEnv,
help="Running environment of wok server")
- parser.add_option('--federation', default=federation,
- help="Register and discover Kimchi peers in the same "
- "network using openSLP. Check README-federation
for"
- " more details.")
- parser.add_option('--create_iso_pool', default=isopool,
- help="Automatically create ISO pool on server start
up.")
parser.add_option('--test', action='store_true',
help="Run server in mock model")
(options, args) = parser.parse_args()
--
2.5.0