mirror of
https://github.com/ansible/awx.git
synced 2026-03-27 22:05:07 -02:30
AAP-45937 Make settings not required because they are not (#15998)
* Make settings not required because they are not, or should not be
This commit is contained in:
@@ -38,6 +38,7 @@ class SettingsRegistry(object):
|
|||||||
if setting in self._registry:
|
if setting in self._registry:
|
||||||
raise ImproperlyConfigured('Setting "{}" is already registered.'.format(setting))
|
raise ImproperlyConfigured('Setting "{}" is already registered.'.format(setting))
|
||||||
category = kwargs.setdefault('category', None)
|
category = kwargs.setdefault('category', None)
|
||||||
|
kwargs.setdefault('required', False) # No setting is ordinarily required
|
||||||
category_slug = kwargs.setdefault('category_slug', slugify(category or '') or None)
|
category_slug = kwargs.setdefault('category_slug', slugify(category or '') or None)
|
||||||
if category_slug in {'all', 'changed', 'user-defaults'}:
|
if category_slug in {'all', 'changed', 'user-defaults'}:
|
||||||
raise ImproperlyConfigured('"{}" is a reserved category slug.'.format(category_slug))
|
raise ImproperlyConfigured('"{}" is a reserved category slug.'.format(category_slug))
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ register(
|
|||||||
),
|
),
|
||||||
category=_('System'),
|
category=_('System'),
|
||||||
category_slug='system',
|
category_slug='system',
|
||||||
required=False,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
register(
|
register(
|
||||||
@@ -239,7 +238,6 @@ register(
|
|||||||
help_text=_('List of modules allowed to be used by ad-hoc jobs.'),
|
help_text=_('List of modules allowed to be used by ad-hoc jobs.'),
|
||||||
category=_('Jobs'),
|
category=_('Jobs'),
|
||||||
category_slug='jobs',
|
category_slug='jobs',
|
||||||
required=False,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
register(
|
register(
|
||||||
@@ -250,7 +248,6 @@ register(
|
|||||||
('never', _('Never')),
|
('never', _('Never')),
|
||||||
('template', _('Only On Job Template Definitions')),
|
('template', _('Only On Job Template Definitions')),
|
||||||
],
|
],
|
||||||
required=True,
|
|
||||||
label=_('When can extra variables contain Jinja templates?'),
|
label=_('When can extra variables contain Jinja templates?'),
|
||||||
help_text=_(
|
help_text=_(
|
||||||
'Ansible allows variable substitution via the Jinja2 templating '
|
'Ansible allows variable substitution via the Jinja2 templating '
|
||||||
@@ -275,7 +272,6 @@ register(
|
|||||||
register(
|
register(
|
||||||
'AWX_ISOLATION_SHOW_PATHS',
|
'AWX_ISOLATION_SHOW_PATHS',
|
||||||
field_class=fields.StringListIsolatedPathField,
|
field_class=fields.StringListIsolatedPathField,
|
||||||
required=False,
|
|
||||||
label=_('Paths to expose to isolated jobs'),
|
label=_('Paths to expose to isolated jobs'),
|
||||||
help_text=_(
|
help_text=_(
|
||||||
'List of paths that would otherwise be hidden to expose to isolated jobs. Enter one path per line. '
|
'List of paths that would otherwise be hidden to expose to isolated jobs. Enter one path per line. '
|
||||||
@@ -441,7 +437,6 @@ register(
|
|||||||
register(
|
register(
|
||||||
'AWX_ANSIBLE_CALLBACK_PLUGINS',
|
'AWX_ANSIBLE_CALLBACK_PLUGINS',
|
||||||
field_class=fields.StringListField,
|
field_class=fields.StringListField,
|
||||||
required=False,
|
|
||||||
label=_('Ansible Callback Plugins'),
|
label=_('Ansible Callback Plugins'),
|
||||||
help_text=_('List of paths to search for extra callback plugins to be used when running jobs. Enter one path per line.'),
|
help_text=_('List of paths to search for extra callback plugins to be used when running jobs. Enter one path per line.'),
|
||||||
category=_('Jobs'),
|
category=_('Jobs'),
|
||||||
@@ -555,7 +550,6 @@ register(
|
|||||||
help_text=_('Port on Logging Aggregator to send logs to (if required and not provided in Logging Aggregator).'),
|
help_text=_('Port on Logging Aggregator to send logs to (if required and not provided in Logging Aggregator).'),
|
||||||
category=_('Logging'),
|
category=_('Logging'),
|
||||||
category_slug='logging',
|
category_slug='logging',
|
||||||
required=False,
|
|
||||||
)
|
)
|
||||||
register(
|
register(
|
||||||
'LOG_AGGREGATOR_TYPE',
|
'LOG_AGGREGATOR_TYPE',
|
||||||
@@ -577,7 +571,6 @@ register(
|
|||||||
help_text=_('Username for external log aggregator (if required; HTTP/s only).'),
|
help_text=_('Username for external log aggregator (if required; HTTP/s only).'),
|
||||||
category=_('Logging'),
|
category=_('Logging'),
|
||||||
category_slug='logging',
|
category_slug='logging',
|
||||||
required=False,
|
|
||||||
)
|
)
|
||||||
register(
|
register(
|
||||||
'LOG_AGGREGATOR_PASSWORD',
|
'LOG_AGGREGATOR_PASSWORD',
|
||||||
@@ -589,7 +582,6 @@ register(
|
|||||||
help_text=_('Password or authentication token for external log aggregator (if required; HTTP/s only).'),
|
help_text=_('Password or authentication token for external log aggregator (if required; HTTP/s only).'),
|
||||||
category=_('Logging'),
|
category=_('Logging'),
|
||||||
category_slug='logging',
|
category_slug='logging',
|
||||||
required=False,
|
|
||||||
)
|
)
|
||||||
register(
|
register(
|
||||||
'LOG_AGGREGATOR_LOGGERS',
|
'LOG_AGGREGATOR_LOGGERS',
|
||||||
@@ -776,7 +768,6 @@ register(
|
|||||||
allow_null=True,
|
allow_null=True,
|
||||||
category=_('System'),
|
category=_('System'),
|
||||||
category_slug='system',
|
category_slug='system',
|
||||||
required=False,
|
|
||||||
hidden=True,
|
hidden=True,
|
||||||
)
|
)
|
||||||
register(
|
register(
|
||||||
|
|||||||
Reference in New Issue
Block a user