浏览代码

[lab] Try to get newjail command working ... still doesn't

Colin Powell 6 月之前
父节点
当前提交
3182f3899b
共有 1 个文件被更改,包括 23 次插入13 次删除
  1. 23 13
      lab/cli.py

+ 23 - 13
lab/cli.py

@@ -10,27 +10,27 @@ import subprocess
 pp = pprint.PrettyPrinter()
 logger = logging.getLogger(__name__)
 
-DEFAULT_HOST_FILE = 'hosts'
-DEFAULT_PLAYBOOK = 'playbook.yml'
-DEFAULT_ANSIBLE_DIR = 'lab/ansible'
+DEFAULT_HOST_FILE = "hosts"
+DEFAULT_PLAYBOOK = "playbook.yml"
+DEFAULT_ANSIBLE_DIR = "lab/ansible"
+
 
 def get_inventory() -> dict:
     host_file = os.path.join(DEFAULT_ANSIBLE_DIR, DEFAULT_HOST_FILE)
     loader = DataLoader()
     inventory = InventoryManager(loader=loader, sources=host_file)
     x = {}
-    ignore = ('all', 'ungrouped')
-    x.update(inventory.groups['all'].serialize()['vars'])
+    ignore = ("all", "ungrouped")
+    x.update(inventory.groups["all"].serialize()["vars"])
     group_dict = inventory.get_groups_dict()
 
     for group in inventory.groups:
         if group in ignore:
             continue
-        x.update({
-            group: group_dict[group]
-        })
+        x.update({group: group_dict[group]})
     return x
 
+
 def roles() -> list:
     sorted_roles = sorted(list(get_inventory().keys()))
     if sys.stdin and sys.stdin.isatty():
@@ -38,8 +38,8 @@ def roles() -> list:
             print(role)
     return sorted_roles
 
-def update(roles):
 
+def update(roles):
     if len(roles) == 1:
         roles = roles[0]
     else:
@@ -52,18 +52,29 @@ def update(roles):
     if sys.stdin and sys.stdin.isatty():
         subprocess.run(call_list, cwd=DEFAULT_ANSIBLE_DIR)
 
+
 def newjail(jail_name) -> None:
     if len(jail_name) == 1:
         jail_name = jail_name[0]
     else:
-        print('Requires a single new jail name')
+        print("Requires a single new jail name")
         return
 
-    call_list = ["ansible", "rhea", "-m", "ansible.builtin.shell",  "-a", f'"/usr/local/bin/newjail {jail_name}"', "--become", "-K"]
+    call_list = [
+        "ansible",
+        "rhea",
+        "-m",
+        "ansible.builtin.shell",
+        "-a",
+        f'"newjail {jail_name}"',
+        "--become",
+        "-K",
+    ]
     print(call_list)
     if sys.stdin and sys.stdin.isatty():
         subprocess.run(call_list, cwd=DEFAULT_ANSIBLE_DIR)
 
+
 def main():
     del sys.argv[0]
 
@@ -76,6 +87,5 @@ def main():
             return eval(func)()
 
 
-
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()