Add refresh-config feature to NFS-Ganesha

Author: sac

examples/add-client-block-refresh-config.conf

@@ -0,0 +1,25 @@
+# Add a client block and run-refresh config
+# config-block: is the variable containing lines (| separated) which will be
+#               added to the client block.
+#
+# The client block will look something like:
+#   client {
+# clients = 10.0.0.1;
+# allow_root_access = true;
+# access_type = "RO";
+# Protocols = "3";
+# anonymous_uid = 1440;
+# anonymous_gid = 72;
+# }
+#
+
+[hosts]
+dhcp37-102.lab.eng.blr.redhat.com
+dhcp37-103.lab.eng.blr.redhat.com
+
+[nfs-ganesha]
+action=refresh-config
+# Default block name is `client'
+# block-name=client
+config-block=clients = 10.0.0.1;|allow_root_access = true;|access_type = "RO";|Protocols = "2", "3";|anonymous_uid = 1440;|anonymous_gid = 72;
+volname=ganesha

examples/add-line-refresh-config.conf

@@ -0,0 +1,8 @@
+[hosts]
+dhcp37-102.lab.eng.blr.redhat.com
+dhcp37-103.lab.eng.blr.redhat.com
+
+[nfs-ganesha]
+action=refresh-config
+add-config-lines=clients = 10.0.0.1;|anonymous_gid = 72;
+volname=ganesha

examples/delete-and-add-block.config

@@ -0,0 +1,12 @@
+[hosts]
+dhcp37-102.lab.eng.blr.redhat.com
+dhcp37-103.lab.eng.blr.redhat.com
+
+[nfs-ganesha]
+action=refresh-config
+# This is a regular expression, lines containing clients will be removed to
+# delete more than one line separate the values by |
+del-config-lines=clients
+block-name=client
+config-block=clients = 10.0.0.1;|allow_root_access = true;|access_type = "RO";|Protocols = "3";|anonymous_uid = 1440;|anonymous_gid = 72;
+volname=ganesha

examples/delete-line-refresh-config.conf

@@ -0,0 +1,8 @@
+[hosts]
+dhcp37-102.lab.eng.blr.redhat.com
+dhcp37-103.lab.eng.blr.redhat.com
+
+[nfs-ganesha]
+action=refresh-config
+del-config-lines=client
+volname=ganesha

examples/gluster.conf.sample

@@ -1241,16 +1241,6 @@ client_mount_points=/mnt/gluster{1,3}
 # `ctdb_nodes' variable in the above example is optional, if it is removed the
 # nodes used to create volume are used as ctdb nodes.
 #
-# Other supported variables include:
-# CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
-# CTDB_NODES=/etc/ctdb/nodes
-# CTDB_MANAGES_SAMBA=no
-# CTDB_SET_DeterministicIPs=1
-# CTDB_SET_RecoveryBanPeriod=120
-# CTDB_SET_KeepaliveInterval=5
-# CTDB_SET_KeepaliveLimit=5
-# CTDB_SET_MonitorInterval=15
-# CTDB_RECOVERY_LOCK=/mnt/lock/reclock
 #
 # NOTE: Expect the user to specify nodes in the cluster under section
 # 'hosts'
@@ -1288,7 +1278,7 @@ client_mount_points=/mnt/gluster{1,3}
 # action=setup
 # public_address=10.70.37.6/24 eth0,10.70.37.8/24 eth0
 # volname=ctdb
-# 
+#
 #-----------------------------------
 
 

examples/refresh-config.conf

@@ -0,0 +1,7 @@
+[hosts]
+dhcp37-102.lab.eng.blr.redhat.com
+dhcp37-103.lab.eng.blr.redhat.com
+
+[nfs-ganesha]
+action=refresh-config
+volname=ganesha

gdeployfeatures/clients/clients.py

@@ -41,7 +41,7 @@ def clients_mount(section_dict):
 def nfs_mount(mnt, host, section_dict):
     global client_mounts, helpers
     options = section_dict.pop('options')
-    if type(options) != list:
+    if type(options) is not list:
         options = [options]
     section_dict['opts'] = ",".join(options)
     client_mounts[host].append({'mountpoint': mnt, 'fstype': 'nfs'})

gdeployfeatures/nfs_ganesha/nfs_ganesha.json

@@ -64,6 +64,32 @@
               "required": "true"
           }
         ]
+      },
+      "refresh-config": {
+        "options": [
+          {
+            "required": "false",
+            "name": "del-config-lines"
+          },
+          {
+             "name": "add-config-lines",
+             "required": "false"
+          },
+          {
+              "name": "block-name",
+              "required": "false",
+              "default": "client"
+          },
+          {
+              "name": "volname",
+              "required": "true"
+          },
+          {
+              "name": "ha-conf-dir",
+              "required": "false",
+              "default": "/etc/ganesha"
+          }
+        ]
       }
     }
   }

gdeployfeatures/nfs_ganesha/nfs_ganesha.py

@@ -60,6 +60,29 @@ def nfs_ganesha_unexport_volume(section_dict):
     section_dict = get_base_dir(section_dict)
     return section_dict, defaults.GANESHA_VOL_EXPORT
 
+def nfs_ganesha_refresh_config(section_dict):
+    del_lines = list_to_string(section_dict.get('del-config-lines'))
+    # Split the string which is `|' delimited. Escaped `|' is handled gracefully
+    section_dict['del-config-lines'] = helpers.split_string(del_lines, '|')
+
+    add_lines = list_to_string(section_dict.get('add-config-lines'))
+    section_dict['add-config-lines'] = helpers.split_string(add_lines, '|')
+
+    block_name = section_dict.get('block-name')
+    section_dict['block-name'] = block_name
+
+    config_block = list_to_string(section_dict.get('config-block'))
+    section_dict['config-block'] = helpers.split_string(config_block, '|')
+
+    section_dict['ha-conf-dir'] = section_dict.get('ha-conf-dir')
+    section_dict = get_base_dir(section_dict)
+
+    if config_block:
+        section_dict['config-block'].insert(0, '%s {'%block_name)
+        section_dict['config-block'].append('}\n')
+
+    return section_dict, defaults.GANESHA_REFRESH_CONFIG
+
 def get_cluster_nodes(section_dict):
     global helpers
     cluster_nodes = section_dict.get('cluster-nodes')
@@ -93,3 +116,11 @@ def get_base_dir(section_dict):
     section_dict['base_dir'] = Global.base_dir
     section_dict['ha_base_dir'] = '/etc/ganesha'
     return section_dict
+
+def list_to_string(l):
+    # If l is a list of lines, join and return string
+    if type(l) is list:
+        return ",".join(l)
+    else:
+        # Return the string
+        return l

gdeployfeatures/yum/yum.py

@@ -33,7 +33,7 @@ def yum_remove(section_dict):
 
 def get_common_data(section_dict):
     packages = section_dict.pop('packages')
-    if type(packages) != list:
+    if type(packages) is not list:
         packages = [packages]
     section_dict['name'] = ','.join(packages)
     return section_dict, defaults.YUM_OP