[FIX] Fix terraform v1 integration (#47)

Updates

Author: costimuraru

src/ops/cli/terraform.py

@@ -191,5 +191,5 @@ def run_v2_composition(self, args, terraform_path, composition):
         config['terraform'] = {}
         config['terraform']["path"] = "{}{}".format(terraform_path, composition)
         config['terraform']["variables_file"] = "variables.tfvars.json"
-        config['cluster'] = hashlib.md5(self.cluster_config_path).hexdigest()[:6]
+        config['cluster'] = "auto_generated_" + hashlib.md5(self.cluster_config_path).hexdigest()[:6]
         return self.run_composition(args, config)

src/ops/terraform/terraform_cmd_generator.py

@@ -45,7 +45,8 @@ def generate(self, args):
         generate_module_templates = False
 
         plan_variables = terraform_config.get('vars', {})
-        # plan_variables['cluster'] = config['cluster']
+        if not config['cluster'].startswith("auto_generated"):
+            plan_variables['cluster'] = config['cluster']
         if self.cluster_config.has_ssh_keys:
             plan_variables['has_ssh_keys'] = True
             plan_variables['cluster_ssh_pubkey_file'] = self.cluster_config.cluster_ssh_pubkey_file