diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 435f2ad444..dcf403c47e 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -649,7 +649,7 @@ class UnifiedJobTemplateSerializer(BaseSerializer): class Meta: model = UnifiedJobTemplate fields = ('*', 'last_job_run', 'last_job_failed', - 'next_job_run', 'status', 'execution_environment', 'pull') + 'next_job_run', 'status', 'execution_environment') def get_related(self, obj): res = super(UnifiedJobTemplateSerializer, self).get_related(obj) @@ -716,7 +716,7 @@ class UnifiedJobSerializer(BaseSerializer): class Meta: model = UnifiedJob fields = ('*', 'unified_job_template', 'launch_type', 'status', - 'execution_environment', 'pull', + 'execution_environment', 'failed', 'started', 'finished', 'canceled_on', 'elapsed', 'job_args', 'job_cwd', 'job_env', 'job_explanation', 'execution_node', 'controller_node', diff --git a/awx/main/migrations/0124_execution_environments.py b/awx/main/migrations/0124_execution_environments.py index 982b1b21e8..18aad9a174 100644 --- a/awx/main/migrations/0124_execution_environments.py +++ b/awx/main/migrations/0124_execution_environments.py @@ -16,16 +16,6 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AddField( - model_name='unifiedjob', - name='pull', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='unifiedjobtemplate', - name='pull', - field=models.BooleanField(default=True), - ), migrations.CreateModel( name='ExecutionEnvironment', fields=[ diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py index 54c8a000a4..1cd1366a92 100644 --- a/awx/main/models/mixins.py +++ b/awx/main/models/mixins.py @@ -454,7 +454,6 @@ class ExecutionEnvironmentMixin(models.Model): related_name='%(class)ss', help_text=_('The container image to be used for execution.'), ) - pull = models.BooleanField(default=True) class CustomVirtualEnvMixin(models.Model):