Fix an issue where we couldn't schedule custom inventory sources

This commit is contained in:
Matthew Jones
2015-01-20 14:55:05 -05:00
parent 92f4bef948
commit 34aafb2db9
2 changed files with 3 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ from rest_framework import serializers
from polymorphic import PolymorphicModel from polymorphic import PolymorphicModel
# AWX # AWX
from awx.main.constants import CLOUD_PROVIDERS from awx.main.constants import SCHEDULEABLE_PROVIDERS
from awx.main.models import * from awx.main.models import *
from awx.main.utils import update_scm_url, get_type_for_model, get_model_for_type from awx.main.utils import update_scm_url, get_type_for_model, get_model_for_type
@@ -1563,7 +1563,7 @@ class ScheduleSerializer(BaseSerializer):
def validate_unified_job_template(self, attrs, source): def validate_unified_job_template(self, attrs, source):
ujt = attrs[source] ujt = attrs[source]
if type(ujt) == InventorySource and ujt.source not in CLOUD_PROVIDERS: if type(ujt) == InventorySource and ujt.source not in SCHEDULEABLE_PROVIDERS:
raise serializers.ValidationError('Inventory Source must be a cloud resource') raise serializers.ValidationError('Inventory Source must be a cloud resource')
return attrs return attrs

View File

@@ -2,3 +2,4 @@
# All Rights Reserved. # All Rights Reserved.
CLOUD_PROVIDERS = ('azure', 'ec2', 'gce', 'rax', 'vmware') CLOUD_PROVIDERS = ('azure', 'ec2', 'gce', 'rax', 'vmware')
SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom',)