From 53d81d9eced2b65c782c77a6f44ef343578eb3c7 Mon Sep 17 00:00:00 2001
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
Date: Mon, 14 Mar 2016 07:41:11 -0400
Subject: ganesha-ha: merge release-3.7 to master for release-3.8

cherry-pick changes from release-3.7 branch to master in preparation
for 3.8

changes merged/cherry-picked from release-3.7 consist of:

> common-ha: delete virt-IP entry of deleted node
> commit aee983ff43655771a9102592a284d0b0a29ad89f
> BUG: 1250601
>
> common-ha: concise output for HA status
> commit d804b17f2fe92b1516f85f03978072c42ddc6f19
> BUG: 1250628
>
> common-ha : refresh-config should print sensible output
> commit d7adcca24fb9638df2806c01d8ea7e73eec46928
> BUG: 1254494
>
> CommonHA: Avoid scp of the config state to the same host
> commit 07b31a008b59d6c0b06bd17994de85fc56560b38
> BUG: 1259225
>
> CommonHA: Fix the path of 'systemctl' cmd
> commit 8e7ca068720fa6fa50e4746e5b17c305f38171e8
> BUG: 1259225
>
> common-ha: refresh-config output includes dbus "method return" msg
> commit 045cb34238e341d68288893b8f040056e138c04e
> BUG: 1262881
>
> common-ha: distribution neutral location of config files
> commit 6667478cdba920d2658bba2edc99c8f8cc33e271
> BUG: 1251821
>
> common-ha: Corrected refresh-config output parsing
> commit 2892bab69cac2d991509fca1279a659bce1ae793
> BUG: 1254494
>
> common-ha: reliable grace using pacemaker notify actions
> commit e8121c4afb3680f532b450872b5a3ffcb3766a97
> BUG: 1290865
>
> ganesha: Read export_id on each node while performing refresh-config
> commit e0e633cdce7586af92490730257ed7f0cffcff61
> BUG: 1309238
>
> nfs-ganesha: pcs cluster setup needs '--name' option
> commit 812e7321d3c56d329526628fe96a8f6fabea75ca
> BUG: 1314204

Change-Id: I41c19bd369bd9da1092b0677590634a4e9f72813
BUG: 1317424
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/13728
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
---
 extras/ganesha/scripts/dbus-send.sh | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'extras/ganesha/scripts')

diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh
index 79c6a2f38af..87e616c23a2 100755
--- a/extras/ganesha/scripts/dbus-send.sh
+++ b/extras/ganesha/scripts/dbus-send.sh
@@ -72,21 +72,9 @@ function dynamic_export_add()
 
                  EXPORT_ID=`cat $GANESHA_DIR/.export_added`
                  check_cmd_status `echo $?`
+                 EXPORT_ID=EXPORT_ID+1
         #fi
         fi
-        for entry in `grep -n Export_Id  $GANESHA_DIR/exports/export.$VOL.conf \
-        | awk -F":" '{print$1}'`
-        do
-                sed -e "$entry s/Export_Id.*/Export_Id=$EXPORT_ID ;/" -i \
-                $GANESHA_DIR/exports/export.$VOL.conf
-                check_cmd_status `echo $?`
-                dbus-send  --system \
-                --dest=org.ganesha.nfsd  /org/ganesha/nfsd/ExportMgr \
-                org.ganesha.nfsd.exportmgr.AddExport  \
-                string:$GANESHA_DIR/exports/export.$VOL.conf \
-                string:"EXPORT(Export_Id=$EXPORT_ID)"
-                EXPORT_ID=EXPORT_ID+1
-        done
         echo $EXPORT_ID > $GANESHA_DIR/.export_added
         check_cmd_status `echo $?`
         sed -i s/Export_Id.*/"Export_Id= $EXPORT_ID ;"/ \
-- 
cgit