Merge pull request #9957 from jbradberry/isolated-removal

Isolated removal

SUMMARY
Removal of the isolated nodes feature.
ISSUE TYPE

Feature Pull Request

COMPONENT NAME

API

AWX VERSION

Reviewed-by: Alan Rominger <arominge@redhat.com>
Reviewed-by: Jeff Bradberry <None>
Reviewed-by: Elyézer Rezende <None>
Reviewed-by: Bianca Henderson <beeankha@gmail.com>

awx/settings/defaults.py

@@ -126,7 +126,7 @@ LOGIN_URL = '/api/login/'
 PROJECTS_ROOT = '/var/lib/awx/projects/'
 
 # Absolute filesystem path to the directory to host collections for
-# running inventory imports, isolated playbooks
+# running inventory imports
 AWX_ANSIBLE_COLLECTIONS_PATHS = os.path.join(BASE_DIR, 'vendor', 'awx_ansible_collections')
 
 # Absolute filesystem path to the directory for job status stdout (default for
@@ -408,23 +408,6 @@ AUTH_BASIC_ENABLED = True
 # when trying to access a UI page that requries authentication.
 LOGIN_REDIRECT_OVERRIDE = ''
 
-# 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)
-AWX_ISOLATED_HOST_KEY_CHECKING = False
-
-# The number of seconds to sleep between status checks for jobs running on isolated nodes
-AWX_ISOLATED_CHECK_INTERVAL = 30
-
-# The timeout (in seconds) for launching jobs on isolated nodes
-AWX_ISOLATED_LAUNCH_TIMEOUT = 600
-
-# Ansible connection timeout (in seconds) for communicating with isolated instances
-AWX_ISOLATED_CONNECTION_TIMEOUT = 10
-
-# The time (in seconds) between the periodic isolated heartbeat status check
-AWX_ISOLATED_PERIODIC_CHECK = 600
-
 DEVSERVER_DEFAULT_ADDR = '0.0.0.0'
 DEVSERVER_DEFAULT_PORT = '8013'
 
@@ -440,7 +423,6 @@ CELERYBEAT_SCHEDULE = {
     'k8s_reaper': {'task': 'awx.main.tasks.awx_k8s_reaper', 'schedule': timedelta(seconds=60), 'options': {'expires': 50}},
     'send_subsystem_metrics': {'task': 'awx.main.analytics.analytics_tasks.send_subsystem_metrics', 'schedule': timedelta(seconds=20)},
     'cleanup_images': {'task': 'awx.main.tasks.cleanup_execution_environment_images', 'schedule': timedelta(hours=3)},
-    # 'isolated_heartbeat': set up at the end of production.py and development.py
 }
 
 # Django Caching Configuration
@@ -854,12 +836,6 @@ LOGGING = {
             'filename': os.path.join(LOG_ROOT, 'tower_rbac_migrations.log'),
             'formatter': 'simple',
         },
-        'isolated_manager': {
-            'level': 'WARNING',
-            'class': 'logging.handlers.WatchedFileHandler',
-            'filename': os.path.join(LOG_ROOT, 'isolated_manager.log'),
-            'formatter': 'simple',
-        },
         'job_lifecycle': {
             'level': 'DEBUG',
             'class': 'logging.handlers.WatchedFileHandler',
@@ -881,8 +857,6 @@ LOGGING = {
         'awx.main.dispatch': {'handlers': ['dispatcher']},
         'awx.main.consumers': {'handlers': ['console', 'file', 'tower_warnings'], 'level': 'INFO'},
         'awx.main.wsbroadcast': {'handlers': ['wsbroadcast']},
-        'awx.isolated.manager': {'level': 'WARNING', 'handlers': ['console', 'file', 'isolated_manager'], 'propagate': True},
-        'awx.isolated.manager.playbooks': {'handlers': ['management_playbooks'], 'propagate': False},
         'awx.main.commands.inventory_import': {'handlers': ['inventory_import'], 'propagate': False},
         'awx.main.tasks': {'handlers': ['task_system', 'external_logger'], 'propagate': False},
         'awx.main.analytics': {'handlers': ['task_system', 'external_logger'], 'level': 'INFO', 'propagate': False},

awx/settings/development.py

@@ -35,9 +35,6 @@ LOGGING['handlers']['console']['()'] = 'awx.main.utils.handlers.ColorHandler'  #
 LOGGING['handlers']['task_system'] = LOGGING['handlers']['console'].copy()  # noqa
 COLOR_LOGS = True
 
-# Pipe management playbook output to console
-LOGGING['loggers']['awx.isolated.manager.playbooks']['propagate'] = True  # noqa
-
 # celery is annoyingly loud when docker containers start
 LOGGING['loggers'].pop('celery', None)  # noqa
 # avoid awx.main.dispatch WARNING-level scaling worker up/down messages
@@ -67,10 +64,6 @@ CALLBACK_QUEUE = "callback_tasks"
 # Note: This setting may be overridden by database settings.
 AWX_ROLES_ENABLED = True
 
-AWX_ISOLATED_USERNAME = 'root'
-AWX_ISOLATED_CHECK_INTERVAL = 1
-AWX_ISOLATED_PERIODIC_CHECK = 30
-
 # Disable Pendo on the UI for development/test.
 # Note: This setting may be overridden by database settings.
 PENDO_TRACKING_STATE = "off"
@@ -136,17 +129,6 @@ if "pytest" in sys.modules:
         }
     }
 
-
-CELERYBEAT_SCHEDULE.update(
-    {  # noqa
-        'isolated_heartbeat': {
-            'task': 'awx.main.tasks.awx_isolated_heartbeat',
-            'schedule': timedelta(seconds=AWX_ISOLATED_PERIODIC_CHECK),  # noqa
-            'options': {'expires': AWX_ISOLATED_PERIODIC_CHECK * 2},  # noqa
-        }
-    }
-)
-
 CLUSTER_HOST_ID = socket.gethostname()
 
 AWX_CALLBACK_PROFILE = True

awx/settings/production.py

@@ -40,8 +40,6 @@ ANSIBLE_VENV_PATH = os.path.join(BASE_VENV_PATH, "ansible")
 # Tower base virtualenv paths and enablement
 AWX_VENV_PATH = os.path.join(BASE_VENV_PATH, "awx")
 
-AWX_ISOLATED_USERNAME = 'awx'
-
 # Store a snapshot of default settings at this point before loading any
 # customizable config files.
 DEFAULTS_SNAPSHOT = {}
@@ -91,14 +89,4 @@ except IOError:
 
 # The below runs AFTER all of the custom settings are imported.
 
-CELERYBEAT_SCHEDULE.update(
-    {  # noqa
-        'isolated_heartbeat': {
-            'task': 'awx.main.tasks.awx_isolated_heartbeat',
-            'schedule': timedelta(seconds=AWX_ISOLATED_PERIODIC_CHECK),  # noqa
-            'options': {'expires': AWX_ISOLATED_PERIODIC_CHECK * 2},  # noqa
-        }
-    }
-)
-
 DATABASES['default'].setdefault('OPTIONS', dict()).setdefault('application_name', f'{CLUSTER_HOST_ID}-{os.getpid()}-{" ".join(sys.argv)}'[:63])  # noqa