Various cleanups

- Rename some variables and examples
- Label service feature unimplemented

.gitignore

@@ -8,3 +8,4 @@ active_vms.yaml
 vagrant.yaml*
 vagrant.yml*
 host_vars/
+tags

src/nfs-ha.conf.sample

@@ -2,7 +2,7 @@
 HA_NFS_TYPE="glusterfs"
 
 # Shared volume to store NFS state.
-HA_NFS_VOL="ganesha"
+HA_NFS_VOL="state"
 
 # [OPTIONAL] Mount point for shared volume.
-HA_NFS_MNT_DIR="lock"
+HA_NFS_MNT_DIR="state"

src/storhaug

@@ -30,8 +30,9 @@
 
 HA_NUM_SERVERS=0
 HA_SERVERS=""
-HA_CONF="%CONFDIR/sysconfig/storhaug.conf"
-HA_CONF_INCDIR="%CONFDIR/sysconfig/storhaug.d/"
+SYS_CONFDIR="/etc"
+HA_CONF="${SYS_CONFDIR}/sysconfig/storhaug.conf"
+HA_CONF_INCDIR="${SYS_CONFDIR}/sysconfig/storhaug.d/"
 HA_MNT_DIR="/var/run/gluster"
 HA_SMB_MNT_DIR="lock"
 HA_NFS_MNT_DIR="state"

src/storhaug.conf.sample

@@ -29,9 +29,9 @@ HA_VIPS="10.x.x.x 10.x.x.x"
 #   NOTE: These nodes should also be configured as storage nodes, either
 #         implicitly in HA_CLUSTER_NODES or explicitly in STORAGE_NODES
 DETERMINISTIC_FAILOVER=false
-VIP_NODES="server2,server3"
+HA_VIP_NODES="server2,server3"
 
-# Managed access methods
+# [NOT IMPLEMENTED YET] Managed access methods
 # Whitespace-delimited list. Valid values:
 #   nfs
 #   smb