Fix py3 issue

grycap · Jul 28, 2020 · db8eb4e · db8eb4e
1 parent 080ab44
commit db8eb4e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/IM/ConfManager.py b/IM/ConfManager.py
@@ -765,11 +765,11 @@ def generate_playbook(self, vm, ctxt_elem, tmp_dir):
             if vault_password:
                 vault_edit = self.get_vault_editor(vault_password)
                 if configure.recipes.strip().startswith("$ANSIBLE_VAULT"):
-                    recipes = str(vault_edit.vault.decrypt(configure.recipes.strip()))
+                    recipes = vault_edit.vault.decrypt(configure.recipes.strip()).decode()
                 else:
                     recipes = configure.recipes
                 conf_content = merge_recipes(conf_content, recipes)
-                conf_content = str(vault_edit.vault.encrypt(conf_content))
+                conf_content = vault_edit.vault.encrypt(conf_content).decode()
             else:
                 conf_content = merge_recipes(conf_content, configure.recipes)
 
@@ -1026,8 +1026,7 @@ def generate_playbooks_and_hosts(self):
                 for ctxt_elem in contextualizes[ctxt_num]:
                     if ctxt_elem.system in vm_group and ctxt_elem.get_ctxt_tool() == "Ansible":
                         vm = vm_group[ctxt_elem.system][0]
-                        filenames.extend(self.generate_playbook(
-                            vm, ctxt_elem, tmp_dir))
+                        filenames.extend(self.generate_playbook(vm, ctxt_elem, tmp_dir))
 
             filenames.append(self.generate_etc_hosts(tmp_dir))
             filenames.append(self.generate_inventory(tmp_dir))