feat: 作业支持增加参数和执行路径超时时间等

apps/ops/ansible/callback.py

@@ -5,6 +5,7 @@ class DefaultCallback:
     STATUS_MAPPER = {
         'successful': 'success',
         'failure': 'failed',
+        'failed': 'failed',
         'running': 'running',
         'pending': 'pending',
         'unknown': 'unknown'

apps/ops/ansible/runner.py

@@ -13,7 +13,7 @@ class AdHocRunner:
         "reboot", 'shutdown', 'poweroff', 'halt', 'dd', 'half', 'top'
     ]
 
-    def __init__(self, inventory, module, module_args='', pattern='*', project_dir='/tmp/'):
+    def __init__(self, inventory, module, module_args='', pattern='*', project_dir='/tmp/', extra_vars={}):
         self.id = uuid.uuid4()
         self.inventory = inventory
         self.pattern = pattern
@@ -22,6 +22,7 @@ class AdHocRunner:
         self.project_dir = project_dir
         self.cb = DefaultCallback()
         self.runner = None
+        self.extra_vars = extra_vars
 
     def check_module(self):
         if self.module not in self.cmd_modules_choices:
@@ -38,6 +39,7 @@ class AdHocRunner:
             os.mkdir(self.project_dir, 0o755)
 
         ansible_runner.run(
+            extravars=self.extra_vars,
             host_pattern=self.pattern,
             private_data_dir=self.project_dir,
             inventory=self.inventory,

apps/ops/migrations/0030_auto_20221116_1811.py

@@ -0,0 +1,42 @@
+# Generated by Django 3.2.14 on 2022-11-16 10:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ops', '0029_auto_20221111_1919'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='celerytask',
+            options={'ordering': ('name',)},
+        ),
+        migrations.AddField(
+            model_name='job',
+            name='variables',
+            field=models.JSONField(default=dict, verbose_name='Variables'),
+        ),
+        migrations.AlterField(
+            model_name='celerytask',
+            name='name',
+            field=models.CharField(max_length=1024, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='celerytaskexecution',
+            name='date_finished',
+            field=models.DateTimeField(null=True, verbose_name='Date finished'),
+        ),
+        migrations.AlterField(
+            model_name='celerytaskexecution',
+            name='date_published',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Date published'),
+        ),
+        migrations.AlterField(
+            model_name='celerytaskexecution',
+            name='date_start',
+            field=models.DateTimeField(null=True, verbose_name='Date start'),
+        ),
+    ]

apps/ops/migrations/0031_auto_20221116_2024.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.14 on 2022-11-16 12:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ops', '0030_auto_20221116_1811'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='job',
+            name='chdir',
+            field=models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Chdir'),
+        ),
+        migrations.AddField(
+            model_name='job',
+            name='comment',
+            field=models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Comment'),
+        ),
+        migrations.AddField(
+            model_name='job',
+            name='timeout',
+            field=models.IntegerField(default=60, verbose_name='Timeout (Seconds)'),
+        ),
+    ]

apps/ops/models/common.py

@@ -0,0 +1,4 @@
+# 内置环境变量
+BUILTIN_VARIABLES = {
+
+}

apps/ops/models/job.py

@@ -1,3 +1,4 @@
+import json
 import os
 import uuid
 import logging
@@ -35,6 +36,8 @@ class Job(BaseCreateUpdateModel):
     args = models.CharField(max_length=1024, default='', verbose_name=_('Args'), null=True, blank=True)
     module = models.CharField(max_length=128, choices=Modules.choices, default=Modules.shell,
                               verbose_name=_('Module'), null=True)
+    chdir = models.CharField(default="", max_length=1024, verbose_name=_('Chdir'), null=True, blank=True)
+    timeout = models.IntegerField(default=60, verbose_name=_('Timeout (Seconds)'))
     playbook = models.ForeignKey('ops.Playbook', verbose_name=_("Playbook"), null=True, on_delete=models.SET_NULL)
     type = models.CharField(max_length=128, choices=Types.choices, default=Types.adhoc, verbose_name=_("Type"))
     owner = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
@@ -42,6 +45,8 @@ class Job(BaseCreateUpdateModel):
     runas = models.CharField(max_length=128, default='root', verbose_name=_('Runas'))
     runas_policy = models.CharField(max_length=128, choices=RunasPolicies.choices, default=RunasPolicies.skip,
                                     verbose_name=_('Runas policy'))
+    variables = models.JSONField(default=dict, verbose_name=_('Variables'))
+    comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
 
     @property
     def inventory(self):
@@ -50,6 +55,9 @@ class Job(BaseCreateUpdateModel):
     def create_execution(self):
         return self.executions.create()
 
+    def get_variables(self):
+        return json.loads(self.variables)
+
 
 class JobExecution(BaseCreateUpdateModel):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
@@ -70,7 +78,7 @@ class JobExecution(BaseCreateUpdateModel):
         if self.job.type == 'adhoc':
             runner = AdHocRunner(
                 self.inventory_path, self.job.module, module_args=self.job.args,
-                pattern="all", project_dir=self.private_dir
+                pattern="all", project_dir=self.private_dir, extra_vars=self.job.get_variables()
             )
         elif self.job.type == 'playbook':
             runner = PlaybookRunner(

apps/ops/serializers/job.py

@@ -14,6 +14,10 @@ class JobSerializer(serializers.ModelSerializer):
         model = Job
         fields = [
             "id", "name", "instant", "type", "module", "args", "playbook", "assets", "runas_policy", "runas", "owner",
+            "variables",
+            "timeout",
+            "chdir",
+            "comment",
             "date_created",
             "date_updated"
         ]