[node-patches] Change in ovirt-node[master]: Remove toplevel kinit directory and associated files

[mburns at redhat.com]

Michael Burns has uploaded a new change for review.

Change subject: Remove toplevel kinit directory and associated files
......................................................................

Remove toplevel kinit directory and associated files

kerberos authentication is not currently used or supported.

Change-Id: I9bded21036f0908a9812096532a211b502c322bd
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M Makefile.am
M configure.ac
D kinit/Makefile.am
D kinit/ovirt-kinit
M ovirt-node.spec.in
M scripts/ovirt-init-functions.sh
6 files changed, 0 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/15/12015/1

diff --git a/Makefile.am b/Makefile.am
index 15d7117..83d3c5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@
 SUBDIRS =   \
   dracut \
   images \
-  kinit \
   recipe \
   scripts \
   services \
diff --git a/configure.ac b/configure.ac
index f4dd166..2af27d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@
 AC_CONFIG_FILES([Makefile
                 dracut/Makefile
                 images/Makefile
-                kinit/Makefile
                 scripts/Makefile
                 tools/Makefile
                 scripts/collectd.conf
diff --git a/kinit/Makefile.am b/kinit/Makefile.am
deleted file mode 100644
index 3d2ce7b..0000000
--- a/kinit/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2010 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA  02110-1301, USA.  A copy of the GNU General Public License is
-# also available at http://www.gnu.org/copyleft/gpl.html.
-
-EXTRA_DIST = \
-  ovirt-kinit
diff --git a/kinit/ovirt-kinit b/kinit/ovirt-kinit
deleted file mode 100644
index 572d303..0000000
--- a/kinit/ovirt-kinit
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-/usr/kerberos/bin/kinit -k -t /etc/libvirt/krb5.tab qpidd/`hostname`
-
-EXITVALUE=$?
-if [ $EXITVALUE != 0 ]; then
-    /usr/bin/logger -t kinit "ALERT kinit failed abnormally with [$EXITVALUE]"
-fi
-exit $EXITVALUE
-
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 9daac69..a769284 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -47,7 +47,6 @@
 Requires:       iscsi-initiator-utils
 Requires:       ntp
 Requires:       nfs-utils
-Requires:       krb5-workstation
 Requires:       bash
 Requires:       chkconfig
 Requires:       bind-utils
diff --git a/scripts/ovirt-init-functions.sh b/scripts/ovirt-init-functions.sh
index 24139c6..59f31ac 100644
--- a/scripts/ovirt-init-functions.sh
+++ b/scripts/ovirt-init-functions.sh
@@ -1161,20 +1161,6 @@
     if is_standalone; then
         return 0
     fi
-    find_srv ipa tcp
-    if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
-        krb5_conf=/etc/krb5.conf
-        # FIXME this is IPA specific
-        wget -q --no-check-certificate \
-            http://$SRV_HOST:$SRV_PORT/ipa/config/krb5.ini -O $krb5_conf.tmp
-        if [ $? -ne 0 ]; then
-            log "Failed to get $krb5_conf"; return 1
-        fi
-        mv $krb5_conf.tmp $krb5_conf
-    else
-        log "skipping Kerberos configuration"
-    fi
-
 
     find_srv collectd udp
     if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
@@ -1293,10 +1279,8 @@
 
         # persist selected configuration files
         ovirt_store_config \
-            /etc/krb5.conf \
             /etc/node.d \
             /etc/sysconfig/node-config \
-            /etc/libvirt/krb5.tab \
             /etc/ssh/ssh_host*_key*
 
         . /usr/libexec/ovirt-functions


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bded21036f0908a9812096532a211b502c322bd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Michael Burns <mburns at redhat.com>