diff --git a/awx/main/conf.py b/awx/main/conf.py index 22c399a2f0..bd9b953695 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -246,18 +246,6 @@ register( category_slug='jobs', ) -register( - 'AWX_ISOLATED_VERBOSITY', - field_class=fields.IntegerField, - min_value=0, - max_value=5, - label=_('Verbosity level for isolated node management tasks'), - help_text=_('This can be raised to aid in debugging connection issues for isolated task execution'), - category=_('Jobs'), - category_slug='jobs', - default=0 -) - register( 'AWX_ISOLATED_CHECK_INTERVAL', field_class=fields.IntegerField, @@ -777,16 +765,6 @@ register( category=_('Logging'), category_slug='logging', ) -register( - 'LOG_AGGREGATOR_AUDIT', - field_class=fields.BooleanField, - allow_null=True, - default=False, - label=_('Enabled external log aggregation auditing'), - help_text=_('When enabled, all external logs emitted by Tower will also be written to /var/log/tower/external.log. This is an experimental setting intended to be used for debugging external log aggregation issues (and may be subject to change in the future).'), # noqa - category=_('Logging'), - category_slug='logging', -) register( 'LOG_AGGREGATOR_MAX_DISK_USAGE_GB', field_class=fields.IntegerField, @@ -822,15 +800,6 @@ register( ) -register( - 'BROKER_DURABILITY', - field_class=fields.BooleanField, - label=_('Message Durability'), - help_text=_('When set (the default), underlying queues will be persisted to disk. Disable this to enable higher message bus throughput.'), - category=_('System'), - category_slug='system', -) - register( 'AUTOMATION_ANALYTICS_LAST_GATHER', diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index f67965917e..1895a47b72 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -386,9 +386,6 @@ AUTH_BASIC_ENABLED = True # when trying to access a UI page that requries authentication. LOGIN_REDIRECT_OVERRIDE = '' -# If set, serve only minified JS for UI. -USE_MINIFIED_JS = False - # Default to skipping isolated host key checking (the initial connection will # hang on an interactive "The authenticity of host example.org can't be # established" message) @@ -406,19 +403,13 @@ AWX_ISOLATED_CONNECTION_TIMEOUT = 10 # The time (in seconds) between the periodic isolated heartbeat status check AWX_ISOLATED_PERIODIC_CHECK = 600 -# Verbosity level for isolated node management tasks -AWX_ISOLATED_VERBOSITY = 0 - DEVSERVER_DEFAULT_ADDR = '0.0.0.0' DEVSERVER_DEFAULT_PORT = '8013' # Set default ports for live server tests. os.environ.setdefault('DJANGO_LIVE_TEST_SERVER_ADDRESS', 'localhost:9013-9199') -BROKER_DURABILITY = True -BROKER_POOL_LIMIT = None BROKER_URL = 'unix:///var/run/redis/redis.sock' -BROKER_TRANSPORT_OPTIONS = {} CELERYBEAT_SCHEDULE = { 'tower_scheduler': { 'task': 'awx.main.tasks.awx_periodic_scheduler', @@ -644,7 +635,6 @@ INSIGHTS_TRACKING_STATE = False # Last gather date for Analytics AUTOMATION_ANALYTICS_LAST_GATHER = None -AUTOMATION_ANALYTICS_INTERVAL = 14400 # Default list of modules allowed for ad hoc commands. # Note: This setting may be overridden by database settings. @@ -909,20 +899,8 @@ SCM_EXCLUDE_EMPTY_GROUPS = False ACTIVITY_STREAM_ENABLED = True ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC = False -# Internal API URL for use by inventory scripts and callback plugin. -INTERNAL_API_URL = 'http://127.0.0.1:%s' % DEVSERVER_DEFAULT_PORT - CALLBACK_QUEUE = "callback_tasks" -SCHEDULER_QUEUE = "scheduler" - -TASK_COMMAND_PORT = 6559 - -SOCKETIO_NOTIFICATION_PORT = 6557 -SOCKETIO_LISTEN_PORT = 8080 - -FACT_CACHE_PORT = 6564 - # Note: This setting may be overridden by database settings. ORG_ADMINS_CAN_SEE_ALL_USERS = True MANAGE_ORGANIZATION_AUTH = True @@ -1202,7 +1180,6 @@ LOGGING = { }, } } -LOG_AGGREGATOR_AUDIT = False # Apply coloring to messages logged to the console COLOR_LOGS = False diff --git a/awx/settings/production.py b/awx/settings/production.py index fb39719767..c2cde28c0f 100644 --- a/awx/settings/production.py +++ b/awx/settings/production.py @@ -30,12 +30,6 @@ SECRET_KEY = None # See https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts ALLOWED_HOSTS = [] -# Production should only use minified JS for UI. -USE_MINIFIED_JS = True - -# URL used by inventory script and callback plugin to access API. -INTERNAL_API_URL = 'http://127.0.0.1:80' - # Absolute filesystem path to the directory for job status stdout # This directory should not be web-accessible JOBOUTPUT_ROOT = '/var/lib/awx/job_status/' diff --git a/installer/roles/image_build/files/settings.py b/installer/roles/image_build/files/settings.py index d1e38b3e89..507e9b4d7b 100644 --- a/installer/roles/image_build/files/settings.py +++ b/installer/roles/image_build/files/settings.py @@ -22,8 +22,6 @@ SECRET_KEY = get_secret() ALLOWED_HOSTS = ['*'] -INTERNAL_API_URL = 'http://awxweb:8052' - # Container environments don't like chroots AWX_PROOT_ENABLED = False diff --git a/installer/roles/kubernetes/templates/configmap.yml.j2 b/installer/roles/kubernetes/templates/configmap.yml.j2 index 485c5ccf4d..c657fa9df7 100644 --- a/installer/roles/kubernetes/templates/configmap.yml.j2 +++ b/installer/roles/kubernetes/templates/configmap.yml.j2 @@ -157,7 +157,6 @@ data: JOBOUTPUT_ROOT = '/var/lib/awx/job_status' SECRET_KEY = open('/etc/tower/SECRET_KEY', 'rb').read().strip() ALLOWED_HOSTS = ['*'] - INTERNAL_API_URL = 'http://127.0.0.1:8052' SERVER_EMAIL = 'root@localhost' DEFAULT_FROM_EMAIL = 'webmaster@localhost' EMAIL_SUBJECT_PREFIX = '[AWX] '