Change in vdsm[master]: Include vds_name parameter for node registration

Fernando Granha Jeronimo has uploaded a new change for review.

Change subject: Include vds_name parameter for node registration
......................................................................

Include vds_name parameter for node registration

Motivation: in ovirt, the vds_name does not need to be resolvable.
In order to allow an arbitrary name, a new kernel parameter was created
(node_name). If this paramter is not passed, vdsm-reg will stick to
the hostname of the node (the previous behavior).

Change-Id: Ic1b0bcc473ef1a034736f80e1424e211ddf02946
Signed-off-by: Fernando Granha Jeronimo <fgranha(a)linux.vnet.ibm.com&gt;
---
M vdsm_reg/config.py.in
M vdsm_reg/vdsm-config
M vdsm_reg/vdsm-reg-cmdline
M vdsm_reg/vdsm-reg-setup.in
M vdsm_reg/vdsm-reg.conf.in
5 files changed, 19 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/8036/1

diff --git a/vdsm_reg/config.py.in b/vdsm_reg/config.py.in
index 6519ec2..d00b427 100644
--- a/vdsm_reg/config.py.in
+++ b/vdsm_reg/config.py.in
@@ -35,5 +35,6 @@
 config.set('vars', 'vdc_host_port', '80')
 config.set('vars', 'vdc_reg_port', '54321')
 config.set('vars', 'vdc_reg_uri',
'/SolidICE/VdsAutoRegistration.aspx')
+config.set('vars', 'vds_name', 'None')
 config.set('vars', 'vdsm_conf_file', '/etc/vdsm/vdsm.conf')
 config.set('vars', 'vdsm_dir', '@VDSMDIR@')
diff --git a/vdsm_reg/vdsm-config b/vdsm_reg/vdsm-config
index 1cb4c2c..6e0f7f3 100755
--- a/vdsm_reg/vdsm-config
+++ b/vdsm_reg/vdsm-config
@@ -65,6 +65,9 @@
 				rhevm_admin_password=*)
 				rhevm_admin_password=${i#rhevm_admin_password=}
 				;;
+				node_name=*)
+				node_name=${i#node_name=}
+				;;
 				*)
 				;;
 			esac
@@ -75,6 +78,7 @@
 			vdc_managment_server=${managment_server%:*}
 			vdc_managment_port=${managment_server#*:}
 			strRHEVMAddress=$vdc_managment_server
+			vds_name=${node_name}
 			tmp_vdsm_reg_conf=`mktemp`
 			cat /etc/vdsm-reg/vdsm-reg.conf > "$tmp_vdsm_reg_conf"
 			echo "checkpoint 3::management_server: $vdc_managment_server, management_port:
$vdc_managment_port" >> $LOG 2>&1
@@ -108,6 +112,11 @@
 				echo "No management_server_fingerprint found." | tee -a $LOG
 			fi
 
+			if [ ! -z "$vds_name" ]; then
+				sed --copy -i "s/\(^vds_name=\)\(..*$\)/\1${vds_name}/" \
+					/etc/vdsm-reg/vdsm-reg.conf
+			fi
+
 			## Set new configuration
 			fWriteConfig=1
 		else
diff --git a/vdsm_reg/vdsm-reg-cmdline b/vdsm_reg/vdsm-reg-cmdline
index 92ed468..e7f0047 100644
--- a/vdsm_reg/vdsm-reg-cmdline
+++ b/vdsm_reg/vdsm-reg-cmdline
@@ -3,4 +3,5 @@
 management_server
 management_server_fingerprint
 rhevm_admin_password
+node_name
 ovirt_vdsm_disable
diff --git a/vdsm_reg/vdsm-reg-setup.in b/vdsm_reg/vdsm-reg-setup.in
index 492e38d..8652293 100644
--- a/vdsm_reg/vdsm-reg-setup.in
+++ b/vdsm_reg/vdsm-reg-setup.in
@@ -48,7 +48,12 @@
         self.vdsmDir = config.get('vars', 'vdsm_dir')
         if self.vdcURL != "None":
             self.ovirtURL = deployUtil.getMGTIP(self.vdsmDir, self.vdcName)
-            self.ovirtName = socket.gethostname()
+
+            # use the name from config file, otherwise get the fqdn
+            self.ovirtName = config.get('vars', 'vds_name')
+            if self.ovirtName is None or self.ovirtName == "None":
+                self.ovirtName = socket.gethostname()
+
             self.ovirtUID = deployUtil.getHostID()
         else:
             self.ovirtURL = "None"
diff --git a/vdsm_reg/vdsm-reg.conf.in b/vdsm_reg/vdsm-reg.conf.in
index 2e9df0d..c38401c 100644
--- a/vdsm_reg/vdsm-reg.conf.in
+++ b/vdsm_reg/vdsm-reg.conf.in
@@ -13,6 +13,8 @@
 vdc_host_port=443
 #The registrtion uri
 vdc_reg_uri=/OvirtEngineWeb/register
+# The name of this node (it does not need to be resolvable)
+vds_name=None
 #Upgrade settings
 upgrade_iso_file=@VDSMUPGRADEDIR(a)/ovirt-node-image.iso
 upgrade_mount_point=/live


--
To view, visit http://gerrit.ovirt.org/8036
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1b0bcc473ef1a034736f80e1424e211ddf02946
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Fernando Granha Jeronimo <fgranha(a)linux.vnet.ibm.com&gt;