summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorSoumya Koduri <skoduri@redhat.com>2016-03-03 14:08:39 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-03-03 18:11:14 -0800
commit812e7321d3c56d329526628fe96a8f6fabea75ca (patch)
treea96b81fa0fa4f52215665b2a7303d4be1d81ed06 /extras
parentcdc96d5d4c6247d9b0ca942eeb37338dacfe93ee (diff)
nfs-ganesha: pcs cluster setup needs '--name' option
Even on fedora machines (on f22, f23), pcs cluster setup CLI expects '--name' to be provided. This patch addresses the same. Change-Id: Id33c8bbdc33955dd54729b10c720f4fa646f7e8c BUG: 1314204 Signed-off-by: Soumya Koduri <skoduri@redhat.com> Reviewed-on: http://review.gluster.org/13590 Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'extras')
-rw-r--r--extras/ganesha/scripts/ganesha-ha.sh9
1 files changed, 1 insertions, 8 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index e7d5641..d866220 100644
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -170,8 +170,7 @@ setup_cluster()
logger "setting up cluster ${name} with the following ${servers}"
pcs cluster auth ${servers}
- # fedora pcs cluster setup ${name} ${servers}
- # rhel6 pcs cluster setup --name ${name} ${servers}
+ # pcs cluster setup --name ${name} ${servers}
pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} ${servers}
if [ $? -ne 0 ]; then
logger "pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} ${servers} failed"
@@ -842,12 +841,6 @@ main()
eval $(echo ${cfgline} | grep -F HA_VOL_SERVER=)
cfgline=$(grep ^HA_CLUSTER_NODES= ${ha_conf})
eval $(echo ${cfgline} | grep -F HA_CLUSTER_NODES=)
-
- # we'll pretend that nobody ever edits /etc/os-release
- if [ -e /etc/os-release ]; then
- eval $(grep -F "REDHAT_SUPPORT_PRODUCT=" /etc/os-release)
- [ "$REDHAT_SUPPORT_PRODUCT" == "Fedora" ] && RHEL6_PCS_CNAME_OPTION=""
- fi
fi
case "${cmd}" in