5:07 a.m.
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Royce Lv (2):
Update doc for federation
Deregister peer information when kimchid exit
docs/README-federation.md | 4 +++-
src/kimchi/model/peers.py | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
--
1.9.1
5:07 a.m.
New subject: [kimchi-devel][PATCH 1/2] Update doc for federation
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Update doc for federation of deb based system.
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
docs/README-federation.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/README-federation.md b/docs/README-federation.md
index 47adfeb..b71a172 100644
--- a/docs/README-federation.md
+++ b/docs/README-federation.md
@@ -10,7 +10,9 @@ virtualization and requires additional software installation.
To enable it, do the following:
-1. Install openslp and openslp-server packages
+1. Install openslp and openslp-server rpm packages,
+ or install slpd and slptool deb packages.
+
2. openSLP uses port 427 (UDP) and port 427 (TCP) so make sure to open those
ports in your firewall configuration
--
1.9.1
5:07 a.m.
New subject: [kimchi-devel][PATCH 2/2] Deregister peer information when kimchid exit
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Peer information after kimchid exit,
fix this by deregister from slpd when cherrypy engine exit.
Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
---
src/kimchi/model/peers.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/kimchi/model/peers.py b/src/kimchi/model/peers.py
index a9f5fcd..611ac82 100644
--- a/src/kimchi/model/peers.py
+++ b/src/kimchi/model/peers.py
@@ -17,6 +17,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+import cherrypy
import re
import socket
@@ -41,6 +42,17 @@ class PeersModel(object):
if out and len(out) != 0:
kimchi_log.error("Unable to register server on openSLP."
" Details: %s" % out)
+ cherrypy.engine.subscribe('exit', self._peer_deregister)
+
+
+ def _peer_deregister(self):
+ cmd = ["slptool", "deregister",
+ "service:kimchid://%s" % self.url]
+ out, error, ret = run_command(cmd)
+ if out and len(out) != 0:
+ kimchi_log.error("Unable to deregister server on openSLP."
+ " Details: %s" % out)
+
def get_list(self):
# check federation feature is enabled on Kimchi server
--
1.9.1
8:22 a.m.
Reviewed-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
On 16/03/2015 07:07, lvroyce(a)linux.vnet.ibm.com wrote:
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Royce Lv (2):
Update doc for federation
Deregister peer information when kimchid exit
docs/README-federation.md | 4 +++-
src/kimchi/model/peers.py | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
3318
days inactive
3322
days old
4 comments
2 participants
participants (2)
-
Aline Manera -
lvroyce＠linux.vnet.ibm.com