!464 om适配共享存储dorado模式（主集群）

Merge pull request !464 from Carl/master

script/gspylib/common/LocalBaseOM.py

@@ -49,7 +49,8 @@ class LocalBaseOM(object):
                  gtmInitParas=None,
                  paxos_mode=False,
                  dss_mode=False,
-                 dss_config=""):
+                 dss_config="",
+                 dorado_config=""):
         '''
         Constructor
         '''
@@ -79,6 +80,7 @@ class LocalBaseOM(object):
         self.paxos_mode = paxos_mode
         self.dss_mode = dss_mode
         self.dss_config = dss_config
+        self.dorado_config = dorado_config
 
     def initComponent(self, paxos_mode=False):
         """
@@ -153,6 +155,7 @@ class LocalBaseOM(object):
             component.paxos_mode = paxos_mode
             self.initComponentAttributes(component)
             component.initParas = self.initParas
+            component.dorado_config = self.dorado_config
             self.dnCons.append(component)
 
     def readConfigInfo(self):

script/gspylib/common/ParallelBaseOM.py

@@ -80,6 +80,7 @@ class ParallelBaseOM(object):
         self.cnCons = []
         self.dnCons = []
         self.dss_cons = []
+        self.dorado_config = ""
         # localMode is same as isSingle in all OM script, expect for
         # gs_preinstall.
         # in gs_preinstall, localMode means local mode for master-standby

script/gspylib/common/ParameterParsecheck.py

@@ -68,7 +68,7 @@ gs_preinstall = ["-?", "--help", "-V", "--version", "-U:", "-G:", "-L",
                  "-l:", "--non-interactive", "--delete-root-trust", "--unused-third-party"]
 gs_install = ["-?", "--help", "-V", "--version", "-X:", "-l:",
               "--gsinit-parameter=", "--dn-guc=", "--cms-guc=",
-              "--time-out=", "--alarm-component="]
+              "--time-out=", "--dorado-config=", "--alarm-component="]
 gs_uninstall = ["-?", "--help", "-V", "--version", "-l:", "-L",
                 "--delete-data"]
 gs_postuninstall = ["-?", "--help", "-V", "--version", "--delete-user",
@@ -302,6 +302,7 @@ class Parameter():
                               "--alarm-type": "warningType",
                               "--alarm-server-addr": "warningserverip",
                               "--time-out": "time_out", "": "",
+                              "--dorado-config": "dorado-config",
                               "--alarm-component": "alarm_component",
                               "--SSD-fault-time": "SSDFaultTime",
                               "--begin-time": "begintime",
@@ -473,6 +474,8 @@ class Parameter():
                 PARAMETER_VALUEDICT['new_values'] = value.strip().split(",")
             elif key == "--upgrade-package":
                 PARAMETER_VALUEDICT["upgrade-package"] = value.strip()
+            elif key == "--dorado-config":
+                PARAMETER_VALUEDICT["dorado-config"] = value.strip()
             # Only check / symbol for gs_lcct.
             if key in ("--name", "--nodegroup-name"):
                 self.checkLcGroupName(key, value)