Merge branch 'cinghio/easycloud-20018385_corrections'

core/metamonitor.py

@@ -56,7 +56,7 @@ class MetaMonitor(ABC):
         self.conf = conf
         self.commands_queue = commands_queue
         self.measurements_queue = measurements_queue
-        self._metrics_file = metrics_file if metrics_file is not None else DEFAULT_METRICS_FILE
+        self._metrics_file = metrics_file
 
         self.metrics = None
 

modules/gcp_libcloud/settings.cfg.template

@@ -8,12 +8,12 @@
 # (the name value is up to you). Click on "create" button and you will obtain "your client ID" and
 # "your client secret" to paste into to gcp_access_key_id and gcp_secret_access_key respectively.
 # The gpc_project is the id of the project that you can read by clicking on the project name at the top of the 
-# web console, just next to "google cloud platfom" wording. The last field, gcp_datacenter can be "none".
+# web console, just next to "google cloud platfom" wording. The last field, gcp_zone must contain a valid zone (es: us-west1-a).
 
 gcp_access_key_id = 
 gcp_secret_access_key =
 gcp_project_id = 
-gcp_datacenter = 
+gcp_zone = 
 
 [alwaysfree]