add conf for openstack hostname

Author: mariojmdavid

acc_scripts/osacc_functions.py

@@ -33,6 +33,7 @@ def get_conf():
     parser.read('/etc/osacc.conf')
     ev = {}
     ev['out_dir'] = parser.get('DEFAULT', 'OUT_DIR')
+    ev['openstack_host'] = parser.get('DEFAULT', 'OPENSTACK_HOST')
     ev['month_ini'] = parser.getint('DEFAULT', 'MONTH_INI')
     ev['year_ini'] = parser.getint('DEFAULT', 'YEAR_INI')
     ev['delta_time'] = parser.getfloat('DEFAULT', 'DELTA_TIME')

acc_scripts/osinfo2md.py

@@ -68,28 +68,15 @@
 import os
 import json
 from datetime import datetime, timezone
+import osacc_functions as oaf
 
 if __name__ == '__main__':
     if len(sys.argv) < 3:
         print(f'Error json file not specified: {sys.argv[0]} <data.json> <output_dir>')
         sys.exit(1)
 
-    osdashconf = "/etc/openstack-dashboard/local_settings"
-    osinfra = ''
-    if os.path.isfile(osdashconf):
-        with open(osdashconf, 'r', encoding='utf-8') as fp:
-            for l_no, line in enumerate(fp):
-                if 'OPENSTACK_HOST' in line:
-                    osinfra = line.split('\"')[1]
-                    break
-
-    if os.path.isfile(osdashconf + '.py'):
-        with open(osdashconf + '.py', 'r', encoding='utf-8') as fp:
-            for l_no, line in enumerate(fp):
-                if 'OPENSTACK_HOST' in line:
-                    osinfra = line.split('\"')[1]
-                    break
-
+    ev = oaf.get_conf()
+    osinfra = ev['openstack_host']
     json_file = sys.argv[1]
     out_dir = sys.argv[2] + '/'
     if not os.path.isdir(out_dir):

etc/osacc.conf

@@ -3,6 +3,9 @@
 # the filenames are <YEAR>.hdf
 OUT_DIR = /var/log/osacc
 
+# Openstack public hostname
+OPENSTACK_HOST = myos.com
+
 # (Mandatory) Month and Year to start the accounting
 MONTH_INI = 1
 YEAR_INI = 2016