Move utils to separate file

Author: rylev

ansible/ansible.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+
+# Utilities for creating the Ansible environment we use.
+
+import subprocess
+import pathlib
+import sys
+import shutil
+
+BASE_PATH = pathlib.Path(__file__).resolve().parent
+VENV_PATH = BASE_PATH / ".venv"
+
+# Ansible changes a lot between releases and deprecates a lot of stuff each of
+# them. Using a pinned ansible identical between all team members should
+# reduce the churn.
+def install_ansible(venv_path = VENV_PATH):
+    requirements = BASE_PATH / "requirements.txt"
+    venv_requirements = venv_path / "installed-requirements.txt"
+
+    # Avoid installing ansible in the virtualenv multiple times
+    if venv_requirements.exists() and \
+       venv_requirements.read_bytes() == requirements.read_bytes():
+        return
+
+    print("creating a new virtual environment and install ansible in it...")
+    shutil.rmtree(venv_path, ignore_errors=True)
+    subprocess.run([sys.executable, "-m", "venv", str(venv_path)], check=True)
+    subprocess.run([
+        str(venv_path / "bin" / "pip"), "install", "-r", str(requirements),
+    ], check=True)
+    shutil.copy(str(requirements), str(venv_requirements))
+
+def create_workspace(dir, env, playbook):
+    env_dir = BASE_PATH / "envs" / env
+    # Create a temporary directory merging together the chosen
+    # environment, the chosen playbook and the shared files.
+    (dir / "play").mkdir()
+    (dir / "play" / "roles").symlink_to(BASE_PATH / "roles")
+    (dir / "play" / "group_vars").symlink_to(BASE_PATH / "group_vars")
+    (dir / "play" / "playbook.yml").symlink_to(
+        BASE_PATH / "playbooks" / (playbook + ".yml")
+    )
+    (dir / "env").symlink_to(env_dir)
+    (dir / "ansible.cfg").symlink_to(BASE_PATH / "ansible.cfg")

ansible/apply

@@ -1,55 +1,18 @@
 #!/usr/bin/env python3
 import subprocess
 import pathlib
-import sys
 import shutil
 import tempfile
 import argparse
-import os
-
-BASE_PATH = pathlib.Path(__file__).resolve().parent
-VENV_PATH = BASE_PATH / ".venv"
-
-# Ansible changes a lot between releases and deprecates a lot of stuff each of
-# them. Using a pinned ansible identical between all team members should
-# reduce the churn.
-def install_ansible(venv_path = VENV_PATH):
-    requirements = BASE_PATH / "requirements.txt"
-    venv_requirements = venv_path / "installed-requirements.txt"
-
-    # Avoid installing ansible in the virtualenv multiple times
-    if venv_requirements.exists() and \
-       venv_requirements.read_bytes() == requirements.read_bytes():
-        return
-
-    print("creating a new virtual environment and install ansible in it...")
-    shutil.rmtree(venv_path, ignore_errors=True)
-    subprocess.run([sys.executable, "-m", "venv", str(venv_path)], check=True)
-    subprocess.run([
-        str(venv_path / "bin" / "pip"), "install", "-r", str(requirements),
-    ], check=True)
-    shutil.copy(str(requirements), str(venv_requirements))
-
-def create_workspace(dir, env, playbook):
-    env_dir = BASE_PATH / "envs" / env
-    # Create a temporary directory merging together the chosen
-    # environment, the chosen playbook and the shared files.
-    (dir / "play").mkdir()
-    (dir / "play" / "roles").symlink_to(BASE_PATH / "roles")
-    (dir / "play" / "group_vars").symlink_to(BASE_PATH / "group_vars")
-    (dir / "play" / "playbook.yml").symlink_to(
-        BASE_PATH / "playbooks" / (playbook + ".yml")
-    )
-    (dir / "env").symlink_to(env_dir)
-    (dir / "ansible.cfg").symlink_to(BASE_PATH / "ansible.cfg")
+import ansible
 
 def run_playbook(args):
     tempdir = pathlib.Path(tempfile.mkdtemp())
-    create_workspace(tempdir, args.env, args.playbook)
+    ansible.create_workspace(tempdir, args.env, args.playbook)
     try:
         # Invoke the ansible binary installed in the virtualenv
         ansible_args = [
-            str(VENV_PATH / "bin" / "ansible-playbook"),
+            str(ansible.VENV_PATH / "bin" / "ansible-playbook"),
             "-i", str(tempdir / "env" / "hosts"),
             str(tempdir / "play" / "playbook.yml"),
         ]
@@ -76,5 +39,5 @@ if __name__ == "__main__":
     )
     args = parser.parse_args()
 
-    install_ansible()
+    ansible.install_ansible()
     run_playbook(args)

packer/packer

@@ -1,22 +1,13 @@
 #!/usr/bin/env python3
 
 import os
-import sys
 import subprocess
 import pathlib
 import shutil
 import argparse
-
-# Python makes us jump through hoops to import module from
-# a file that does not end in .py
-def load_module():
-    from importlib.util import spec_from_loader, module_from_spec
-    from importlib.machinery import SourceFileLoader 
-    apply = os.path.join(os.path.dirname(__file__), '../ansible/apply')
-    spec = spec_from_loader("apply", SourceFileLoader("apply", apply))
-    apply = module_from_spec(spec)
-    spec.loader.exec_module(apply)
-    return apply
+import sys
+sys.path.append("../ansible")
+import ansible
 
 # Utility for removing everything in a directory except one thing
 def remove_all_except_one(directory, exception):
@@ -46,9 +37,8 @@ def create_workspace_dir():
 # Create the workspace environment
 def create_workspace(env, playbook):
     workspace = create_workspace_dir()
-    apply = load_module()
-    apply.install_ansible(workspace / ".venv")
-    apply.create_workspace(workspace, env, playbook)
+    ansible.install_ansible(workspace / ".venv")
+    ansible.create_workspace(workspace, env, playbook)
 
     # Link the template into the workspace
     template_path = pathlib.Path(playbook).resolve()