New subject: Change in vdsm[master]: Remove unused tool config-rhev-manager

Wednesday, 20 July 2011

New patch submitted by Federico Simoncelli (fsimonce(a)redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/729

commit 704f77d820af665b84273d478eddf0833aa717c9
Author: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Date:   Wed Jul 20 13:15:24 2011 +0000

    Remove unused tool config-rhev-manager
    
    Change-Id: I1541c023ce510e3bfc8bd25c51956992dea72476

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 64b73aa..069cd32 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -424,9 +424,7 @@ machines without running real guests.
 %{_datadir}/%{vdsm_reg}/deployUtil.py*
 %{_datadir}/%{vdsm_reg}/createDaemon.py*
 %{py_sitedir}/ovirt_config_setup/rhevm.py*
-%attr (755,root,root) %{_datadir}/%{vdsm_reg}/config-rhev-manager
 %attr (755,root,root) %{_datadir}/%{vdsm_reg}/save-config
-%{_sysconfdir}/ovirt-config-setup.d
 %{_sysconfdir}/ovirt-config-boot.d/vdsm-config
 %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm-reg
 %{_sysconfdir}/cron.hourly/vdsm-reg-logrotate
diff --git a/vdsm_reg/Makefile b/vdsm_reg/Makefile
index 2218553..d1d5d75 100644
--- a/vdsm_reg/Makefile
+++ b/vdsm_reg/Makefile
@@ -22,12 +22,11 @@ install: fixpaths
 	
 	cp -p vdsm-reg $(PREFIX)$(ETC)/init.d
 	cp -p {logger.conf,vdsm-reg.conf} $(PREFIX)$(CONFDIR)
-	cp -p define.py config.py config-rhev-manager save-config deployUtil.py createDaemon.py
$(PREFIX)$(VDSMREGDIR)
+	cp -p define.py config.py save-config deployUtil.py createDaemon.py
$(PREFIX)$(VDSMREGDIR)
 	cp -p vdsm-reg-setup.py $(PREFIX)$(VDSMREGDIR)/vdsm-reg-setup
 	cp -p vdsm-gen-cert.py $(PREFIX)$(VDSMREGDIR)/vdsm-gen-cert
 	cp -p vdsm-complete.py $(PREFIX)$(VDSMREGDIR)/vdsm-complete
 	cp -p vdsm-upgrade.py $(PREFIX)$(VDSMREGDIR)/vdsm-upgrade
-	ln -s $(VDSMREGDIR)/config-rhev-manager
$(PREFIX)$(ETC)/ovirt-config-setup.d/"40_Configure the host for RHEV"
 	cp -p vdsm-config $(PREFIX)$(ETC)/ovirt-config-boot.d
 	cp -p vdsm-reg-logrotate.conf $(PREFIX)$(ETC)/logrotate.d/vdsm-reg
 	cp -p vdsm-reg-logrotate $(PREFIX)$(ETC)/cron.hourly
diff --git a/vdsm_reg/config-rhev-manager b/vdsm_reg/config-rhev-manager
deleted file mode 100755
index 9a8a13e..0000000
--- a/vdsm_reg/config-rhev-manager
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#
-# config-rhev-manager 
-#
-# description:  RHEV manager IP/host setting
-#
-. /usr/libexec/ovirt-functions
-VDSM_CONFIG=/etc/vdsm/vdsm.conf
-GETCONFITEM=/usr/share/vdsm/get-conf-item
-strRHEVMAddress=""
-fWriteConfig=0
-
-warn() { printf '%s\n' "$*" >&2; }
-
-if ! is_local_storage_configured; then
-    warn "Configure local storage before configuring RHEV-M."
-    exit 99
-fi
-if ! network_up; then
-    warn "Configure network before configuring RHEV-M."
-    exit 99
-fi
-
-set_vars() {
-	echo "[vars]" >> $VDSM_CONFIG #Adding ts for the coming scripts.
-	echo "trust_store_path = " `$GETCONFITEM $VDSM_CONFIG vars trust_store_path
/etc/pki/vdsm` >> $VDSM_CONFIG
-	echo "ssl = " `$GETCONFITEM $VDSM_CONFIG vars ssl true` >> $VDSM_CONFIG
-	echo "" >> $VDSM_CONFIG
-}
-
-set_addresses() {
-	echo "[addresses]" >> $VDSM_CONFIG #Adding ts for the coming scirpts.
-	echo "management_port = " `$GETCONFITEM $VDSM_CONFIG addresses management_port
54321` >> $VDSM_CONFIG
-	echo "" >> $VDSM_CONFIG
-}
-
-	echo "Generating RHEV agent configuration files"
-	if [ ! -s $VDSM_CONFIG ];
-	then
-		set_vars
-		set_addresses
-		ovirt_store_config $VDSM_CONFIG
-		echo "RHEV agent configuration files created."
-	else
-		echo "RHEV agent configuration files already exist."
-	fi
-        echo "RHEV Manager configuration"
-	echo ""
-	echo "Enter the RHEV Manager's hostname or IP address."
-	echo "Optionally: append a port after the hostname or IP address"
-	echo "For example, 192.168.0.1:443 or rhev.redhat.com:443"
-
-
-	read strResponse
-	IP=${strResponse%:*}
-	PORT=${strResponse#*:}
-
-	response=1
-	ping -c 1 $IP >/dev/null 2>&1 || response=0
-
-	if [ $response -gt 0 ]
-	then
-		## IP OK
-		sed -i --copy "s/\(^vdc_host_name=\)\(..*$\)/\1${IP}/"
/etc/vdsm-reg/vdsm-reg.conf
-		printf "The RHEV Manager's address is set.\n" >&2
-
-		if [ "$IP" != "$PORT" ]; then
-			sed -i --copy "s/\(^vdc_host_port=\)\(..*$\)/\1${PORT}/" \
-				/etc/vdsm-reg/vdsm-reg.conf
-			printf "The RHEV Manager's port set.\n" >&2
-		fi
-
-		## Set new configuration
-		fWriteConfig=1
-
-		sleep 3
-	else
-		## Not OK
-		printf "Either %s is an invalid address or the RHEV Manager unresponsive.\n"
"$IP" >&2
-		sleep 3
-		exit 1
-	fi
-
-	if [ $fWriteConfig -gt 0 ]; then ## Save new configuration
-		ovirt_store_config /etc/vdsm-reg/vdsm-reg.conf
-	fi
-exit 0



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[NEW PATCH] Remove unused tool config-rhev-manager (via gerrit-bot)