backport of timezip.py from mv->linhes

remove BECONFIG from running during the db_chroot process, as it already runs during systemconfig.

1 files changed, 45 insertions, 5 deletions

diff --git a/abs/core-testing/LinHES-config/timezip.py b/abs/core-testing/LinHES-config/timezip.py
index ad9bbd0..18f338f 100755
--- a/abs/core-testing/LinHES-config/timezip.py
+++ b/abs/core-testing/LinHES-config/timezip.py
@@ -20,6 +20,8 @@ def printvars():
     print "BEhostname:" + BEhostname
     print "zipcode:" + zipcode
     print "timezone:" + tz
+    print "timezone region:" + tz_region
+    print "timezone subregion:" + tz_subregion
     print "nfsip:" + nfsip
     print "nfstoggle:" + nfstoggle
     print "nfsmount:"  + nfsmount
@@ -30,6 +32,8 @@ def selectvars():
     global BEhostname
     global zipcode
     global tz
+    global tz_region
+    global tz_subregion
     global nfsip
     global nfstoggle
     global nfsmount
@@ -41,10 +45,7 @@ def selectvars():
     # execute SQL statement
     cursor.execute("select hostname from settings where value='BackendServerIP' and data=(%s)",(masterdb))
     result = cursor.fetchone()
-    try:
-        BEhostname=result[0]
-    except TypeError:
-        BEhostname=""
+    BEhostname=result[0]
 
     cursor.execute("select data from settings where value='HostZipcode' and hostname=(%s)",(BEhostname))
     result = cursor.fetchone()
@@ -80,14 +81,29 @@ def selectvars():
         tz=result[0]
     except TypeError:
         tz=""
+##########
+    cursor.execute("select data from settings where value='HostTimeZoneRegion' and hostname=(%s)",(BEhostname))
+    result = cursor.fetchone()
+    try:
+        tz_region=result[0]
+    except TypeError:
+        tz=""
+    tempsubregion="HostTimeZoneRegion_" + tz_region
 
+    cursor.execute("select data from settings where value=%s and hostname=(%s)",(tempsubregion,BEhostname))
+    result = cursor.fetchone()
+    try:
+        tz_subregion=result[0]
+    except TypeError:
+        tz_subregion=""
+###############
     if  ( thishostname != BEhostname ):
         cursor.execute("select data from settings where value='GlobalServiceHobbitserver'")
         result = cursor.fetchone()
         try:
             hobbitclient=result[0]
         except TypeError:
-            hobbitclient="0"
+            hobbitclient="1"
 
 
 
@@ -117,6 +133,27 @@ def insertvars():
             cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZone'",(tz,thishostname))
             print "updating timezone"
 
+    cursor.execute("select *  from settings where value='HostTimeZoneRegion' and hostname=(%s)",(thishostname))
+    result = cursor.fetchone()
+    if ( tz != ""):
+         if (result == None):
+            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostTimeZoneRegion',(%s),(%s))",(tz_region,thishostname))
+            print "inserting timezone region"
+         else:
+            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZoneRegion'",(tz_region,thishostname))
+            print "updating timezone region"
+
+    tempsubregion="HostTimeZoneRegion_" + tz_region
+    cursor.execute("select *  from settings where value=%s and hostname=(%s)",(tempsubregion,thishostname))
+    result = cursor.fetchone()
+    if ( tz != ""):
+         if (result == None):
+            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ((%s),(%s),(%s))",(tempsubregion,tz_subregion,thishostname))
+            print "inserting timezone subregion"
+         else:
+            cursor.execute("update settings set data=(%s) where hostname=(%s) and value=(%s)",(tempsubregion,tz_subregion,thishostname))
+            print "updating timezone subregion"
+
 
 #start of NFSIP
     cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(thishostname))
@@ -160,6 +197,9 @@ def main(argv):
     global BEhostname
     global zipcode
     global tz
+    global tz_region
+    global tz_subregion
+
     global nfsip
     global hobbitclient
     try: