External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10171 from jakemcdermott/remove-job-isolated-settings

Browse Source 
Remove all AWX_ISOLATED* fields

I believe this should address #10123. The issue mentions a worker-json.js 404 and, while we should fix that at some point, I don't think it's actually related to the save not working.
SUMMARY
I noticed the job settings form wasn't saving on devel.
After some debugging, I found that removing the AWX_ISOLATED_CHECK_INTERVAL and AWX_ISOLATED_LAUNCH_TIMEOUT made the form saveable again.
It doesn't seem like we use any of the AWX_ISOLATED* fields anymore (not to be confused with AWX_ISOLATION* fields, which we do use) so this PR removes them all.
cc @wenottingham @shanemcd @marshmalien  @gamuniz @tiagodread @jbradberry

Reviewed-by: Jeff Bradberry <None>
Reviewed-by: Bill Nottingham <None>
Reviewed-by: Tiago Góes <tiago.goes2009@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-05-13 17:32:15 +00:00 committed by GitHub
commit a332f46f31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 1 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui_next/src/screens/Host/data.hostFacts.json
View File

@ -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",

1
awx/ui_next/src/screens/Inventory/shared/data.hostFacts.json
View File

@ -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",

3
awx/ui_next/src/screens/Job/shared/data.job.json
View File

@ -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",

3
awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.jsx
View File

@ -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

4
awx/ui_next/src/screens/Setting/Jobs/JobsDetail/JobsDetail.test.jsx
View File

@ -54,10 +54,6 @@ describe('<JobsDetail />', () => {
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');

24
awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.jsx
View File

@ -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}
/>
<BooleanField
name="AWX_ISOLATED_HOST_KEY_CHECKING"
config={jobs.AWX_ISOLATED_HOST_KEY_CHECKING}
/>
<InputField
name="AWX_ISOLATED_CHECK_INTERVAL"
config={jobs.AWX_ISOLATED_CHECK_INTERVAL}
type="number"
isRequired
/>
<InputField
name="AWX_ISOLATED_LAUNCH_TIMEOUT"
config={jobs.AWX_ISOLATED_LAUNCH_TIMEOUT}
type="number"
isRequired
/>
<InputField
name="AWX_ISOLATED_CONNECTION_TIMEOUT"
config={jobs.AWX_ISOLATED_CONNECTION_TIMEOUT}
type="number"
/>
<ObjectField
name="AD_HOC_COMMANDS"
config={jobs.AD_HOC_COMMANDS}

3
awx/ui_next/src/screens/Setting/Jobs/JobsEdit/JobsEdit.test.jsx
View File

@ -78,9 +78,6 @@ describe('<JobsEdit />', () => {
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

4
awx/ui_next/src/screens/Setting/Jobs/JobsEdit/data.defaultJobSettings.json
View File

@ -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,

104
awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json
View File

@ -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,

7
awx/ui_next/src/screens/Setting/shared/data.allSettings.json
View File

@ -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,

7
awx/ui_next/src/screens/Setting/shared/data.jobSettings.json
View File

@ -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,