External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6220 from jangsutsr/6188_enable_ctint_category_specific_validation

Browse Source 
Enable Tower configuration category-specific validation
This commit is contained in:
Aaron Tan
2017-06-26 09:45:12 -04:00
committed by GitHub
parent 68ee601359 69dc56c5a1
commit f1869a2f70
5 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
awx/main/conf.py
View File

@@ -6,8 +6,11 @@ import os
# Django
from django.utils.translation import ugettext_lazy as _
# Django REST Framework
from rest_framework import serializers
# Tower
from awx.conf import fields, register
from awx.conf import fields, register, register_validate
logger = logging.getLogger('awx.main.conf')
@@ -360,3 +363,22 @@ register(
category=_('Logging'),
category_slug='logging',
)
def logging_validate(serializer, attrs):
if not serializer.instance:
return attrs
errors = []
if attrs.get('LOG_AGGREGATOR_ENABLED', False):
if not serializer.instance.LOG_AGGREGATOR_HOST and not attrs.get('LOG_AGGREGATOR_HOST', None) or\
serializer.instance.LOG_AGGREGATOR_HOST and not attrs.get('LOG_AGGREGATOR_HOST', True):
errors.append('Cannot enable log aggregator without providing host.')
if not serializer.instance.LOG_AGGREGATOR_TYPE and not attrs.get('LOG_AGGREGATOR_TYPE', None) or\
serializer.instance.LOG_AGGREGATOR_TYPE and not attrs.get('LOG_AGGREGATOR_TYPE', True):
errors.append('Cannot enable log aggregator without providing type.')
if errors:
raise serializers.ValidationError(_('\n'.join(errors)))
return attrs
register_validate('logging', logging_validate)