diff --git a/awx/ui_next/src/screens/Host/data.hostFacts.json b/awx/ui_next/src/screens/Host/data.hostFacts.json index 526d83b344..0675ffb4ef 100644 --- a/awx/ui_next/src/screens/Host/data.hostFacts.json +++ b/awx/ui_next/src/screens/Host/data.hostFacts.json @@ -112,7 +112,6 @@ "ANSIBLE_FORCE_COLOR": "True", "ANSIBLE_CACHE_PLUGIN": "jsonfile", "AWX_PRIVATE_DATA_DIR": "/tmp/awx_13_r1ffeqze", - "AWX_ISOLATED_DATA_DIR": "/tmp/awx_13_r1ffeqze/artifacts/13", "SUPERVISOR_GROUP_NAME": "tower-processes", "SUPERVISOR_SERVER_URL": "unix:///tmp/supervisor.sock", "DJANGO_SETTINGS_MODULE": "awx.settings.development", diff --git a/awx/ui_next/src/screens/Inventory/shared/data.hostFacts.json b/awx/ui_next/src/screens/Inventory/shared/data.hostFacts.json index 526d83b344..0675ffb4ef 100644 --- a/awx/ui_next/src/screens/Inventory/shared/data.hostFacts.json +++ b/awx/ui_next/src/screens/Inventory/shared/data.hostFacts.json @@ -112,7 +112,6 @@ "ANSIBLE_FORCE_COLOR": "True", "ANSIBLE_CACHE_PLUGIN": "jsonfile", "AWX_PRIVATE_DATA_DIR": "/tmp/awx_13_r1ffeqze", - "AWX_ISOLATED_DATA_DIR": "/tmp/awx_13_r1ffeqze/artifacts/13", "SUPERVISOR_GROUP_NAME": "tower-processes", "SUPERVISOR_SERVER_URL": "unix:///tmp/supervisor.sock", "DJANGO_SETTINGS_MODULE": "awx.settings.development", diff --git a/awx/ui_next/src/screens/Job/shared/data.job.json b/awx/ui_next/src/screens/Job/shared/data.job.json index 343c223aac..c67083e98e 100644 --- a/awx/ui_next/src/screens/Job/shared/data.job.json +++ b/awx/ui_next/src/screens/Job/shared/data.job.json @@ -166,8 +166,7 @@ "ANSIBLE_CALLBACK_PLUGINS": "/awx_devel/awx/plugins/callback", "AWX_HOST": "https://towerhost", "ANSIBLE_SSH_CONTROL_PATH_DIR": "/tmp/awx_2_a4b1afiw/cp", - "ANSIBLE_STDOUT_CALLBACK": "awx_display", - "AWX_ISOLATED_DATA_DIR": "/tmp/awx_2_a4b1afiw/artifacts/2" + "ANSIBLE_STDOUT_CALLBACK": "awx_display" }, "job_explanation": "", "execution_node": "awx", diff --git a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx index 52b9bf2faf..271aace96b 100644 --- a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx +++ b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx @@ -26,9 +26,6 @@ function JobsDetail() { const { ALLOW_JINJA_IN_EXTRA_VARS, - AWX_ISOLATED_KEY_GENERATION, - AWX_ISOLATED_PRIVATE_KEY, - AWX_ISOLATED_PUBLIC_KEY, STDOUT_MAX_BYTES_DISPLAY, EVENT_STDOUT_MAX_BYTES_DISPLAY, ...jobsData diff --git a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.test.jsx b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.test.jsx index e4181f4926..3ebcdbe0f4 100644 --- a/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.test.jsx +++ b/awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.test.jsx @@ -54,10 +54,6 @@ describe('', () => { test('should render expected details', () => { assertDetail(wrapper, 'Job execution path', '/tmp'); - assertDetail(wrapper, 'Isolated status check interval', '1 seconds'); - assertDetail(wrapper, 'Isolated launch timeout', '600 seconds'); - assertDetail(wrapper, 'Isolated connection timeout', '10 seconds'); - assertDetail(wrapper, 'Isolated host key checking', 'Off'); assertDetail(wrapper, 'Run Project Updates With Higher Verbosity', 'Off'); assertDetail(wrapper, 'Enable Role Download', 'On'); assertDetail(wrapper, 'Enable Collection(s) Download', 'On'); diff --git a/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.jsx b/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.jsx index 13cf86a6b1..7ba1e96f51 100644 --- a/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.jsx +++ b/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.jsx @@ -30,9 +30,6 @@ function JobsEdit() { const { data } = await SettingsAPI.readCategory('jobs'); const { ALLOW_JINJA_IN_EXTRA_VARS, - AWX_ISOLATED_KEY_GENERATION, - AWX_ISOLATED_PRIVATE_KEY, - AWX_ISOLATED_PUBLIC_KEY, EVENT_STDOUT_MAX_BYTES_DISPLAY, STDOUT_MAX_BYTES_DISPLAY, ...jobsData @@ -170,27 +167,6 @@ function JobsEdit() { name="AWX_SHOW_PLAYBOOK_LINKS" config={jobs.AWX_SHOW_PLAYBOOK_LINKS} /> - - - - ', () => { expect(SettingsAPI.updateAll).toHaveBeenCalledTimes(1); const { ALLOW_JINJA_IN_EXTRA_VARS, - AWX_ISOLATED_KEY_GENERATION, - AWX_ISOLATED_PRIVATE_KEY, - AWX_ISOLATED_PUBLIC_KEY, EVENT_STDOUT_MAX_BYTES_DISPLAY, STDOUT_MAX_BYTES_DISPLAY, ...jobRequest diff --git a/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/data.defaultJobSettings.json b/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/data.defaultJobSettings.json index b9ad233308..be96856bac 100644 --- a/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/data.defaultJobSettings.json +++ b/awx/ui_next/src/screens/Setting/Jobs/JobsEdit/data.defaultJobSettings.json @@ -23,10 +23,6 @@ "ANSIBLE_FACT_CACHE_TIMEOUT": 0, "AWX_ANSIBLE_CALLBACK_PLUGINS": [], "AWX_COLLECTIONS_ENABLED": true, - "AWX_ISOLATED_CHECK_INTERVAL": 1, - "AWX_ISOLATED_CONNECTION_TIMEOUT": 10, - "AWX_ISOLATED_HOST_KEY_CHECKING": false, - "AWX_ISOLATED_LAUNCH_TIMEOUT": 600, "AWX_ISOLATION_BASE_PATH": "/tmp", "AWX_ISOLATION_SHOW_PATHS": [], "AWX_ROLES_ENABLED": true, diff --git a/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json b/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json index 63ae8212fc..ac1724eb77 100644 --- a/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json +++ b/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json @@ -185,68 +185,6 @@ "type": "string" } }, - "AWX_ISOLATED_CHECK_INTERVAL": { - "type": "integer", - "label": "Isolated status check interval", - "help_text": "The number of seconds to sleep between status checks for jobs running on isolated instances.", - "min_value": 0, - "category": "Jobs", - "category_slug": "jobs", - "defined_in_file": false, - "unit": "seconds" - }, - "AWX_ISOLATED_LAUNCH_TIMEOUT": { - "type": "integer", - "label": "Isolated launch timeout", - "help_text": "The timeout (in seconds) for launching jobs on isolated instances. This includes the time needed to copy source control files (playbooks) to the isolated instance.", - "min_value": 0, - "category": "Jobs", - "category_slug": "jobs", - "defined_in_file": false, - "unit": "seconds" - }, - "AWX_ISOLATED_CONNECTION_TIMEOUT": { - "type": "integer", - "label": "Isolated connection timeout", - "help_text": "Ansible SSH connection timeout (in seconds) to use when communicating with isolated instances. Value should be substantially greater than expected network latency.", - "min_value": 0, - "category": "Jobs", - "category_slug": "jobs", - "defined_in_file": false, - "unit": "seconds" - }, - "AWX_ISOLATED_HOST_KEY_CHECKING": { - "type": "boolean", - "label": "Isolated host key checking", - "help_text": "When set to True, AWX will enforce strict host key checking for communication with isolated nodes.", - "category": "Jobs", - "category_slug": "jobs", - "defined_in_file": false - }, - "AWX_ISOLATED_KEY_GENERATION": { - "type": "boolean", - "label": "Generate RSA keys for isolated instances", - "help_text": "If set, a random RSA key will be generated and distributed to isolated instances. To disable this behavior and manage authentication for isolated instances outside of Tower, disable this setting.", - "category": "Jobs", - "category_slug": "jobs", - "defined_in_file": false - }, - "AWX_ISOLATED_PRIVATE_KEY": { - "type": "string", - "label": "The RSA private key for SSH traffic to isolated instances", - "help_text": "The RSA private key for SSH traffic to isolated instances", - "category": "Jobs", - "category_slug": "jobs", - "defined_in_file": false - }, - "AWX_ISOLATED_PUBLIC_KEY": { - "type": "string", - "label": "The RSA public key for SSH traffic to isolated instances", - "help_text": "The RSA public key for SSH traffic to isolated instances", - "category": "Jobs", - "category_slug": "jobs", - "defined_in_file": false - }, "AWX_TASK_ENV": { "type": "nested object", "label": "Extra Environment Variables", @@ -3138,48 +3076,6 @@ "read_only": false } }, - "AWX_ISOLATED_CHECK_INTERVAL": { - "type": "integer", - "required": true, - "label": "Isolated status check interval", - "help_text": "The number of seconds to sleep between status checks for jobs running on isolated instances.", - "min_value": 0, - "category": "Jobs", - "category_slug": "jobs", - "unit": "seconds", - "default": 1 - }, - "AWX_ISOLATED_LAUNCH_TIMEOUT": { - "type": "integer", - "required": true, - "label": "Isolated launch timeout", - "help_text": "The timeout (in seconds) for launching jobs on isolated instances. This includes the time needed to copy source control files (playbooks) to the isolated instance.", - "min_value": 0, - "category": "Jobs", - "category_slug": "jobs", - "unit": "seconds", - "default": 600 - }, - "AWX_ISOLATED_CONNECTION_TIMEOUT": { - "type": "integer", - "required": false, - "label": "Isolated connection timeout", - "help_text": "Ansible SSH connection timeout (in seconds) to use when communicating with isolated instances. Value should be substantially greater than expected network latency.", - "min_value": 0, - "category": "Jobs", - "category_slug": "jobs", - "unit": "seconds", - "default": 10 - }, - "AWX_ISOLATED_HOST_KEY_CHECKING": { - "type": "boolean", - "required": false, - "label": "Isolated host key checking", - "help_text": "When set to True, AWX will enforce strict host key checking for communication with isolated nodes.", - "category": "Jobs", - "category_slug": "jobs", - "default": false - }, "AWX_TASK_ENV": { "type": "nested object", "required": false, diff --git a/awx/ui_next/src/screens/Setting/shared/data.allSettings.json b/awx/ui_next/src/screens/Setting/shared/data.allSettings.json index b8e170996d..724361c5d9 100644 --- a/awx/ui_next/src/screens/Setting/shared/data.allSettings.json +++ b/awx/ui_next/src/screens/Setting/shared/data.allSettings.json @@ -36,13 +36,6 @@ "ALLOW_JINJA_IN_EXTRA_VARS":"template", "AWX_ISOLATION_BASE_PATH":"/tmp", "AWX_ISOLATION_SHOW_PATHS":[], - "AWX_ISOLATED_CHECK_INTERVAL":1, - "AWX_ISOLATED_LAUNCH_TIMEOUT":600, - "AWX_ISOLATED_CONNECTION_TIMEOUT":10, - "AWX_ISOLATED_HOST_KEY_CHECKING":false, - "AWX_ISOLATED_KEY_GENERATION":true, - "AWX_ISOLATED_PRIVATE_KEY":"", - "AWX_ISOLATED_PUBLIC_KEY":"", "AWX_TASK_ENV":{}, "INSIGHTS_TRACKING_STATE":false, "PROJECT_UPDATE_VVV":false, diff --git a/awx/ui_next/src/screens/Setting/shared/data.jobSettings.json b/awx/ui_next/src/screens/Setting/shared/data.jobSettings.json index 301aab89a3..4a975c0062 100644 --- a/awx/ui_next/src/screens/Setting/shared/data.jobSettings.json +++ b/awx/ui_next/src/screens/Setting/shared/data.jobSettings.json @@ -6,13 +6,6 @@ "ALLOW_JINJA_IN_EXTRA_VARS": "template", "AWX_ISOLATION_BASE_PATH": "/tmp", "AWX_ISOLATION_SHOW_PATHS": [], - "AWX_ISOLATED_CHECK_INTERVAL": 1, - "AWX_ISOLATED_LAUNCH_TIMEOUT": 600, - "AWX_ISOLATED_CONNECTION_TIMEOUT": 10, - "AWX_ISOLATED_HOST_KEY_CHECKING": false, - "AWX_ISOLATED_KEY_GENERATION": true, - "AWX_ISOLATED_PRIVATE_KEY": "", - "AWX_ISOLATED_PUBLIC_KEY": "", "AWX_TASK_ENV": {}, "PROJECT_UPDATE_VVV": false, "AWX_ROLES_ENABLED": true,