Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: register: use node name and fqdn when needed
......................................................................
register: use node name and fqdn when needed
Currently, we collect host fqdn before registering but
it's not required. This patch make registration be
triggered without setting host fqdn, it will use node IP
address.
Change-Id: I91c834e10cade4878791be43201ab0966bf251b4
Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com>
---
M lib/vdsm/tool/register.py
1 file changed, 9 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/44221/1
diff --git a/lib/vdsm/tool/register.py b/lib/vdsm/tool/register.py
index ce9cdbe..3656f1d 100644
--- a/lib/vdsm/tool/register.py
+++ b/lib/vdsm/tool/register.py
@@ -84,16 +84,10 @@
self.fprint = fingerprint
self.logger.debug("Fingerprint: {fp}".format(fp=self.fprint))
- if node_fqdn is None:
- self.node_fqdn = socket.gethostname()
- else:
- self.node_fqdn = node_fqdn
+ self.node_fqdn = node_fqdn
self.logger.debug("Node FQDN: {nf}".format(nf=self.node_fqdn))
- if node_name is None:
- self.node_name = socket.gethostname().split(".")[0]
- else:
- self.node_name = node_name
+ self.node_name = node_name
self.logger.debug("Node name: {na}".format(na=self.node_name))
if ssh_user is None:
@@ -145,14 +139,18 @@
uc=ucmd,
c="get-ssh-trust")
- ureg = "{uc}register&name={name}&address={fqdn}&sshUser={sshu}&" \
+ ureg = "{uc}register&sshUser={sshu}&" \
"sshPort={sshp}&port={mp}".format(uc=ucmd,
- name=self.node_name,
- fqdn=self.node_fqdn,
sshu=self.ssh_user,
sshp=self.ssh_port,
mp=self.vdsm_port)
+ if self.node_name is not None:
+ ureg += "&name={name}".format(name=self.node_name)
+
+ if self.node_fqdn is not None:
+ ureg += "&address={fqdn}".format(fqdn=self.node_fqdn)
+
self.url_reg = "{e}{u}".format(e=self.engine_url, u=ureg)
self.logger.debug("Download CA via: {u}".format(u=self.url_CA))
--
To view, visit https://gerrit.ovirt.org/44221
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91c834e10cade4878791be43201ab0966bf251b4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsl...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
