From 665a4d83e38d9f9eb04545eca1f080d113e1c906 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 24 Oct 2017 11:00:13 -0400 Subject: [PATCH] Include vault credential check in job relaunch Relates #7747 of ansible-tower. Signed-off-by: Aaron Tan --- awx/api/serializers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 1805f38352..f4be8560bb 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2703,8 +2703,10 @@ class JobRelaunchSerializer(JobSerializer): def validate(self, attrs): obj = self.context.get('obj') - if not obj.credential: - raise serializers.ValidationError(dict(credential=[_("Credential not found or deleted.")])) + if not obj.credential and not obj.vault_credential: + raise serializers.ValidationError( + dict(credential=[_("Neither credential nor vault credential provided.")]) + ) if obj.project is None: raise serializers.ValidationError(dict(errors=[_("Job Template Project is missing or undefined.")])) if obj.inventory is None or obj.inventory.pending_deletion: