External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove "pull" field from EE mixin

Browse Source 
I think this should go on the EE definition itself
This commit is contained in:
Shane McDonald
2020-10-10 11:01:40 -04:00
parent 966bb6fc74
commit 1f4a45a698
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -649,7 +649,7 @@ class UnifiedJobTemplateSerializer(BaseSerializer):
class Meta: class Meta:
model = UnifiedJobTemplate model = UnifiedJobTemplate
fields = ('*', 'last_job_run', 'last_job_failed', 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): def get_related(self, obj):
res = super(UnifiedJobTemplateSerializer, self).get_related(obj) res = super(UnifiedJobTemplateSerializer, self).get_related(obj)
@@ -716,7 +716,7 @@ class UnifiedJobSerializer(BaseSerializer):
class Meta: class Meta:
model = UnifiedJob model = UnifiedJob
fields = ('*', 'unified_job_template', 'launch_type', 'status', fields = ('*', 'unified_job_template', 'launch_type', 'status',
'execution_environment', 'pull', 'execution_environment',
'failed', 'started', 'finished', 'canceled_on', 'elapsed', 'job_args', 'failed', 'started', 'finished', 'canceled_on', 'elapsed', 'job_args',
'job_cwd', 'job_env', 'job_explanation', 'job_cwd', 'job_env', 'job_explanation',
'execution_node', 'controller_node', 'execution_node', 'controller_node',

10
awx/main/migrations/0124_execution_environments.py
View File

@@ -16,16 +16,6 @@ class Migration(migrations.Migration):
] ]
operations = [ 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( migrations.CreateModel(
name='ExecutionEnvironment', name='ExecutionEnvironment',
fields=[ fields=[

1
awx/main/models/mixins.py
View File

@@ -454,7 +454,6 @@ class ExecutionEnvironmentMixin(models.Model):
related_name='%(class)ss', related_name='%(class)ss',
help_text=_('The container image to be used for execution.'), help_text=_('The container image to be used for execution.'),
) )
pull = models.BooleanField(default=True)
class CustomVirtualEnvMixin(models.Model): class CustomVirtualEnvMixin(models.Model):