Merge pull request #3770 from AlanCoding/playbook_files

Update JT playbook validation for HA
This commit is contained in:
Alan Rominger
2016-10-27 16:05:09 -04:00
committed by GitHub
4 changed files with 10 additions and 23 deletions

View File

@@ -1847,7 +1847,7 @@ class JobOptionsSerializer(LabelsListMixin, BaseSerializer):
job_type = attrs.get('job_type', self.instance and self.instance.job_type or None)
if not project and job_type != PERM_INVENTORY_SCAN:
raise serializers.ValidationError({'project': 'This field is required.'})
if project and playbook and force_text(playbook) not in project.playbooks:
if project and playbook and force_text(playbook) not in project.playbook_files:
raise serializers.ValidationError({'playbook': 'Playbook not found for project.'})
if project and not playbook:
raise serializers.ValidationError({'playbook': 'Must select playbook for project.'})