External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 19:10:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5548 from chrismeyersfsu/fix-blunder

Browse Source 
fix up nightlies
This commit is contained in:
Chris Meyers 2017-02-24 10:28:50 -05:00 committed by GitHub
commit bdbd2a9712
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/conf.py
View File

@ -2,11 +2,9 @@
import json
import logging
import os
import uuid
# Django
from django.utils.translation import ugettext_lazy as _
from django.conf import settings
# Tower
from awx.conf import fields, register
@ -316,20 +314,13 @@ register(
category=_('Logging'),
category_slug='logging',
)
def init_LOG_AGGREGATOR_TOWER_UUID():
unique_id = uuid.uuid4()
settings.LOG_AGGREGATOR_TOWER_UUID = unique_id
return unique_id
register(
'LOG_AGGREGATOR_TOWER_UUID',
field_class=fields.CharField,
allow_blank=True,
label=_('Cluster-wide Tower unique identifier.'),
help_text=_('Useful to uniquely identify Tower instances.'),
category=_('Logging'),
category_slug='logging',
default=init_LOG_AGGREGATOR_TOWER_UUID,
default=None,
)