Merge pull request #541 from matburt/database_config_source

Database config source

awx/main/models/__init__.py

@@ -16,6 +16,7 @@ from awx.main.models.ad_hoc_commands import * # noqa
 from awx.main.models.schedules import * # noqa
 from awx.main.models.activity_stream import * # noqa
 from awx.main.models.ha import * # noqa
+from awx.main.models.configuration import * # noqa
 
 # Monkeypatch Django serializer to ignore django-taggit fields (which break
 # the dumpdata command; see https://github.com/alex/django-taggit/issues/155).
@@ -55,6 +56,7 @@ activity_stream_registrar.connect(Job)
 activity_stream_registrar.connect(AdHocCommand)
 # activity_stream_registrar.connect(JobHostSummary)
 # activity_stream_registrar.connect(JobEvent)
-#activity_stream_registrar.connect(Profile)
+# activity_stream_registrar.connect(Profile)
 activity_stream_registrar.connect(Schedule)
 activity_stream_registrar.connect(CustomInventoryScript)
+activity_stream_registrar.connect(TowerSettings)

awx/main/models/activity_stream.py

@@ -53,6 +53,7 @@ class ActivityStream(models.Model):
     ad_hoc_command = models.ManyToManyField("AdHocCommand", blank=True)
     schedule = models.ManyToManyField("Schedule", blank=True)
     custom_inventory_script = models.ManyToManyField("CustomInventoryScript", blank=True)
+    tower_settings = models.ManyToManyField("TowerSettings", blank=True)
 
     def get_absolute_url(self):
         return reverse('api:activity_stream_detail', args=(self.pk,))

awx/main/models/ad_hoc_commands.py

@@ -21,6 +21,7 @@ from jsonfield import JSONField
 from awx.main.models.base import * # noqa
 from awx.main.models.unified_jobs import * # noqa
 from awx.main.utils import decrypt_field
+from awx.main.conf import tower_settings
 
 logger = logging.getLogger('awx.main.models.ad_hoc_commands')
 
@@ -29,8 +30,8 @@ __all__ = ['AdHocCommand', 'AdHocCommandEvent']
 
 class AdHocCommand(UnifiedJob):
 
-    MODULE_NAME_CHOICES = [(x,x) for x in settings.AD_HOC_COMMANDS]
-    MODULE_NAME_DEFAULT = 'command' if 'command' in settings.AD_HOC_COMMANDS else None
+    MODULE_NAME_CHOICES = [(x,x) for x in tower_settings.AD_HOC_COMMANDS]
+    MODULE_NAME_DEFAULT = 'command' if 'command' in tower_settings.AD_HOC_COMMANDS else None
 
     class Meta(object):
         app_label = 'main'
@@ -104,7 +105,7 @@ class AdHocCommand(UnifiedJob):
         if type(self.module_name) not in (str, unicode):
             raise ValidationError("Invalid type for ad hoc command")
         module_name = self.module_name.strip() or 'command'
-        if module_name not in settings.AD_HOC_COMMANDS:
+        if module_name not in tower_settings.AD_HOC_COMMANDS:
             raise ValidationError('Unsupported module for ad hoc commands.')
         return module_name
 

awx/main/models/configuration.py

@@ -0,0 +1,62 @@
+# Copyright (c) 2015 Ansible, Inc.
+# All Rights Reserved.
+
+# Python
+import json
+
+# Django
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+# Tower
+from awx.main.models.base import CreatedModifiedModel
+
+class TowerSettings(CreatedModifiedModel):
+
+    class Meta:
+        app_label = 'main'
+
+    SETTINGS_TYPE_CHOICES = [
+        ('string', _("String")),
+        ('int', _('Integer')),
+        ('float', _('Decimal')),
+        ('json', _('JSON')),
+        ('bool', _('Boolean')),
+        ('password', _('Password')),
+        ('list', _('List'))
+    ]
+
+    key = models.CharField(
+        max_length=255,
+        unique=True
+    )
+    description = models.TextField()
+    category = models.CharField(max_length=128)
+    value = models.TextField()
+    value_type = models.CharField(
+        max_length=12,
+        choices=SETTINGS_TYPE_CHOICES
+    )
+    user = models.ForeignKey(
+        'auth.User',
+        related_name='settings',
+        default=None,
+        null=True,
+        editable=False,
+    )
+
+    @property
+    def value_converted(self):
+        if self.value_type == 'json':
+            converted_type = json.loads(self.value)
+        elif self.value_type == 'password':
+            converted_type = self.value
+        elif self.value_type == 'list':
+            converted_type = [x.strip() for x in self.value.split(',')]
+        elif self.value_type == 'bool':
+            converted_type = self.value in [True, "true", "True", 1, "1", "yes"]
+        elif self.value_type == 'string':
+            converted_type = self.value
+        else:
+            t = __builtins__[self.value_type]
+            converted_type = t(self.value)
+        return converted_type

awx/main/models/jobs.py

@@ -24,6 +24,7 @@ from awx.main.models.unified_jobs import * # noqa
 from awx.main.utils import decrypt_field, ignore_inventory_computed_fields
 from awx.main.utils import emit_websocket_notification
 from awx.main.redact import PlainTextCleaner
+from awx.main.conf import tower_settings
 
 logger = logging.getLogger('awx.main.models.jobs')
 
@@ -318,9 +319,9 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
 
     @property
     def cache_timeout_blocked(self):
-        if Job.objects.filter(job_template=self, status__in=['pending', 'waiting', 'running']).count() > getattr(settings, 'SCHEDULE_MAX_JOBS', 10):
+        if Job.objects.filter(job_template=self, status__in=['pending', 'waiting', 'running']).count() > getattr(tower_settings, 'SCHEDULE_MAX_JOBS', 10):
             logger.error("Job template %s could not be started because there are more than %s other jobs from that template waiting to run" %
-                         (self.name, getattr(settings, 'SCHEDULE_MAX_JOBS', 10)))
+                         (self.name, getattr(tower_settings, 'SCHEDULE_MAX_JOBS', 10)))
             return True
         return False
 

awx/main/models/organization.py

@@ -18,6 +18,7 @@ from django.utils.translation import ugettext_lazy as _
 # AWX
 from awx.main.fields import AutoOneToOneField
 from awx.main.models.base import * # noqa
+from awx.main.conf import tower_settings
 
 __all__ = ['Organization', 'Team', 'Permission', 'Profile', 'AuthToken']
 
@@ -242,7 +243,7 @@ class AuthToken(BaseModel):
         if not now:
             now = tz_now()
         if not self.pk or not self.is_expired(now=now):
-            self.expires = now + datetime.timedelta(seconds=settings.AUTH_TOKEN_EXPIRATION)
+            self.expires = now + datetime.timedelta(seconds=tower_settings.AUTH_TOKEN_EXPIRATION)
             if save:
                 self.save()
 
@@ -259,12 +260,12 @@ class AuthToken(BaseModel):
         if now is None:
             now = tz_now()
         invalid_tokens = AuthToken.objects.none()
-        if settings.AUTH_TOKEN_PER_USER != -1:
+        if tower_settings.AUTH_TOKEN_PER_USER != -1:
             invalid_tokens = AuthToken.objects.filter(
                 user=user,
                 expires__gt=now,
                 reason='',
-            ).order_by('-created')[settings.AUTH_TOKEN_PER_USER:]
+            ).order_by('-created')[tower_settings.AUTH_TOKEN_PER_USER:]
         return invalid_tokens
 
     def generate_key(self):
@@ -293,7 +294,7 @@ class AuthToken(BaseModel):
         valid_n_tokens_qs = self.user.auth_tokens.filter(
             expires__gt=now,
             reason='',
-        ).order_by('-created')[0:settings.AUTH_TOKEN_PER_USER]
+        ).order_by('-created')[0:tower_settings.AUTH_TOKEN_PER_USER]
         valid_n_tokens = valid_n_tokens_qs.values_list('key', flat=True)
 
         return bool(self.key in valid_n_tokens)