From 812e7321d3c56d329526628fe96a8f6fabea75ca Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Thu, 3 Mar 2016 14:08:39 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/13590 Smoke: Gluster Build System Reviewed-by: jiffin tony Thottan CentOS-regression: Gluster Build System Reviewed-by: Kaleb KEITHLEY NetBSD-regression: NetBSD Build System --- extras/ganesha/scripts/ganesha-ha.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index e7d5641a4db..d866220912f 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 -- cgit