diff options
| author | Soumya Koduri <skoduri@redhat.com> | 2016-03-03 14:08:39 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-03-15 00:25:38 -0700 |
| commit | f032bc6caedd0a53e79888e57c886ba3699d2396 (patch) | |
| tree | 2a26f407d835910431dc8ac6775739c0607870b9 | |
| parent | ef1b79a86714e235a7430e2eb95acceb83cfc774 (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.
BUG: 1314204
Change-Id: If23851bfd7fe2f1c200731d66dcb3e744390ff83
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>
Reviewed-on: http://review.gluster.org/13727
Tested-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | extras/ganesha/scripts/ganesha-ha.sh | 9 |
1 files changed, 1 insertions, 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 |