Merge pull request #3552 from ryanpetrello/final-isolated-cleanup

move awx.main.expect to awx.main.isolated

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

Makefile

@@ -218,7 +218,7 @@ init:
 	if [ "$(AWX_GROUP_QUEUES)" == "tower,thepentagon" ]; then \
 		$(MANAGEMENT_COMMAND) provision_instance --hostname=isolated; \
 		$(MANAGEMENT_COMMAND) register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \
-		$(MANAGEMENT_COMMAND) generate_isolated_key > /awx_devel/awx/main/expect/authorized_keys; \
+		$(MANAGEMENT_COMMAND) generate_isolated_key > /awx_devel/awx/main/isolated/authorized_keys; \
 	fi;
 
 # Refresh development environment after pulling new code.

awx/main/management/commands/test_isolated_connection.py

@@ -8,7 +8,7 @@ from django.core.management.base import BaseCommand, CommandError
 
 import ansible_runner
 
-from awx.main.expect.isolated_manager import set_pythonpath
+from awx.main.isolated.manager import set_pythonpath
 
 
 class Command(BaseCommand):

awx/main/tasks.py

@@ -57,7 +57,7 @@ from awx.main.models import (
 from awx.main.constants import ACTIVE_STATES
 from awx.main.exceptions import AwxTaskError
 from awx.main.queue import CallbackQueueDispatcher
-from awx.main.expect import isolated_manager
+from awx.main.isolated import manager as isolated_manager
 from awx.main.dispatch.publish import task
 from awx.main.dispatch import get_local_queuename, reaper
 from awx.main.utils import (get_ssh_version, update_scm_url,

tools/docker-isolated-override.yml

@@ -12,7 +12,7 @@ services:
     container_name: tools_isolated_1
     hostname: isolated
     volumes:
-      - "../awx/main/expect:/awx_devel"
+      - "../awx/main/isolated:/awx_devel"
       - "../awx/lib:/awx_lib"
       - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
     privileged: true