15120 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shane McDonald	3cd80ef67a	Update pot files	2017-11-30 15:29:29 -05:00
Wayne Witzel III	f3310236e4	Merge pull request #599 from wwitzel3/release_3.2.2 ... Fix git project sync bug.	2017-11-30 11:22:29 -05:00
Wayne Witzel III	ed28faa3db	Use TMP instead of TMPDIR and only set it in RunProjectUpdate	2017-11-30 16:10:12 +00:00
Ryan Petrello	fc4b02b79f	Merge pull request #597 from ryanpetrello/jenkins-no-like-unicode ... removing some cruft we thought would help us catch bugs (it didn't)	2017-11-29 16:39:20 -05:00
Ryan Petrello	a3dd9eb4b7	removing some cruft we thought would help us catch bugs (it didn't)	2017-11-29 16:23:07 -05:00
Ryan Petrello	d773d163f7	Merge pull request #595 from ryanpetrello/fix-workflow-survey-encrypt ... more survey password encryption bug squashing	2017-11-29 15:09:40 -05:00
Ryan Petrello	68ada92f3b	more survey password encryption bug squashing ... the nature of this latest bug is that the WorkflowJob has a *different* implementation of _accept_or_ignore_job_kwargs, and it wasn't performing encryption for extra vars provided at launch time; this change places the encryption mechanism in UJT.create_unified_job so that it works the same for _all_ UJTs see: https://github.com/ansible/ansible-tower/issues/7798 see: https://github.com/ansible/ansible-tower/issues/7046	2017-11-29 14:40:41 -05:00
Aaron Tan	4c43afda19	Merge pull request #586 from jangsutsr/fix-7768 ... Supress exception with concurrent deletion	2017-11-29 13:40:45 -05:00
Ryan Petrello	91cc4689c9	Merge pull request #594 from ryanpetrello/fix-sosreport-venv ... fix incorrect virtualenv path for sosreport plugin	2017-11-29 10:07:12 -05:00
Hideki Saito	febfcf709d	fix incorrect virtualenv path for sosreport plugin	2017-11-29 09:57:41 -05:00
Ryan Petrello	cf1d5a29f6	Merge pull request #593 from ryanpetrello/fix-7796 ... fix another encrypted survey password bug	2017-11-28 17:08:35 -05:00
Ryan Petrello	1425021106	fix another encrypted survey password bug ... properly encrypt extra_vars that overlap with survey passwords when `ask_variables_on_launch=true` see: https://github.com/ansible/ansible-tower/issues/7796	2017-11-28 16:52:47 -05:00
Ryan Petrello	7b42316366	Merge pull request #592 from ryanpetrello/fix-7793 ... fix a bug which caused v1 cred backwards-compat to apply to v2 requests	2017-11-28 14:49:54 -05:00
Ryan Petrello	ce9d75c2e4	Merge pull request #591 from ryanpetrello/rename-ovirt ... rename oVirt4 to Red Hat Virtualization	2017-11-28 13:10:58 -05:00
Ryan Petrello	26845642f0	fix a bug which caused v1 cred backwards-compat to apply to v2 requests ... see: https://github.com/ansible/ansible-tower/issues/7793	2017-11-28 13:05:13 -05:00
Ryan Petrello	6fa0d9d4ed	rename oVirt4 to Red Hat Virtualization ... see: https://github.com/ansible/ansible-tower/issues/7790	2017-11-28 11:02:42 -05:00
Ryan Petrello	7accac2f63	Merge pull request #590 from ryanpetrello/fix-7784 ... fix a bug in survey password default validation within workflows	2017-11-27 18:04:30 -05:00
Ryan Petrello	044c047ac6	fix a bug in survey password default validation ... see: https://github.com/ansible/ansible-tower/issues/7046 see: https://github.com/ansible/ansible-tower/issues/7764 see: https://github.com/ansible/ansible-tower/issues/7784	2017-11-27 17:25:45 -05:00
Chris Meyers	5a2ecd25e7	Merge pull request #589 from ansible/fix-project_update_cascade_fast ... correctly cascade job cancel	2017-11-27 13:21:25 -05:00
Chris Meyers	6c89935521	correctly cascade job cancel ... * Check the reason for a dependent project update failure. If it's because of a cancel, then let the normal cancel mechanisms update the jobs status and explanation. Do not update the dependent job's status for a project update that was canceled, in the run code.	2017-11-27 12:34:55 -05:00
Aaron Tan	0641c6b0a6	Supress exception with concurrent deletion ... Relates https://github.com/ansible/ansible-tower/issues/7768 This issue, as well as https://github.com/ansible/ansible-tower/issues/7622, both rooted in a concurrency issue of Django ORM: https://github.com/ansible/ansible-tower/issues/762://code.djangoproject.com/ticket/28806 The solution related deals specifically with the related issue, but is not a general solution. A general workaround can be found in https://github.com/ansible/tower/pull/500. Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-11-17 16:29:08 -05:00
Alan Rominger	4ea27e0d1b	Merge pull request #587 from AlanCoding/computed_self ... update original when updating computed fields	2017-11-17 12:23:43 -05:00
Wayne Witzel III	79c196fc08	Merge pull request #588 from wwitzel3/release_3.2.2 ... Include all previously run operations to satisfy Django migration planner	2017-11-17 12:12:21 -05:00
Wayne Witzel III	249a5e5e4d	Include all previously run operations to satisfy Django migration planner.	2017-11-17 12:02:07 -05:00
AlanCoding	51c73cb357	update original when updating computed fields	2017-11-17 10:16:49 -05:00
Ryan Petrello	8d35b71321	Merge pull request #585 from ryanpetrello/fix-wfjt-survey-encryption ... re-encrypt WFJT.survey_spec and WorkflowJob.extra_vars too	2017-11-17 08:52:54 -05:00
Ryan Petrello	a80d5b1b39	reencrypt WFJT.survey_spec too ... https://github.com/ansible/ansible-tower/issues/7046	2017-11-16 23:00:22 -05:00
Wayne Witzel III	e5d86419c8	Merge pull request #582 from AlanCoding/smart_computed2 ... update smart inventory computed fields	2017-11-16 19:36:08 -05:00
Greg Considine	54a98ff612	Merge pull request #581 from gconsidine/ui/fix/disabled-button-opacity ... Update disabled button color to match style guide	2017-11-16 16:40:06 -05:00
Ryan Petrello	e7077185bf	Merge pull request #584 from ryanpetrello/release_3.2.2 ... make settings.AWX_ISOLATED_KEY_GENERATION readonly	2017-11-16 13:42:00 -05:00
Ryan Petrello	4187d02b8a	make settings.AWX_ISOLATED_KEY_GENERATION readonly ... see: https://github.com/ansible/ansible-tower/issues/7380	2017-11-16 13:35:37 -05:00
Matthew Jones	457359322f	Merge pull request #583 from ansible/nicer_error_tower_inventory ... Present the tower inventory sync failure in a better way	2017-11-16 13:16:22 -05:00
Matthew Jones	8a65c6e1c8	Present the tower inventory sync failure in a better way ... This allows it to be handled better by ansible 2.4+	2017-11-16 12:59:12 -05:00
AlanCoding	fb29f68efc	update smart inventory computed fields	2017-11-16 11:57:30 -05:00
gconsidine	1fcddba558	Update disabled button color to match style guide	2017-11-16 11:15:23 -05:00
Chris Meyers	e20599d7bb	Merge pull request #580 from chrismeyersfsu/fix-project_update_cascade_tower ... cascade cancel proj update when job canceled	2017-11-15 11:19:35 -05:00
Chris Meyers	9288b53015	cascade cancel proj update when job canceled ... * Implicit project update, launch_type='sync', get "associated" with a job via project_update. When a job is canceled, so should this implicit project update. This change enforces that logic.	2017-11-15 11:17:52 -05:00
Ryan Petrello	82be0a8af2	Merge pull request #579 from ryanpetrello/fix-survey-encryption-migration-failure ... fix a bug in the survey reencryption migration	2017-11-15 10:38:35 -05:00
Ryan Petrello	35c374fc79	fix a bug in the survey reencryption migration ... see: https://github.com/ansible/ansible-tower/issues/7046	2017-11-15 10:26:46 -05:00
Alan Rominger	dbe135991b	Merge pull request #575 from AlanCoding/single_cancel ... do not propogate cancel of inventory sync back up to project	2017-11-15 09:46:41 -05:00
Bill Nottingham	64f89b3fce	Merge pull request #578 from wenottingham/protect-our-environment ... Remove some environment variables the callback plugin doesn't actually use	2017-11-14 16:10:53 -05:00
Bill Nottingham	aaaae87aa7	Remove some environment variables the callback plugin doesn't actually use.	2017-11-14 15:57:49 -05:00
Ryan Petrello	44a2d7a346	Merge pull request #577 from ryanpetrello/release_3.2.2 ... render survey_spec for display purposes in a safe manner	2017-11-13 15:18:09 -05:00
Ryan Petrello	be00b1ca96	render survey_spec for display purposes in a safe manner ... survey_spec is a nested dict, so if we don't `deepcopy()` it, updates to the individual fields could corrupt the original data structure; this was causing a bug whereby activity stream updates converted encrypted survey password defaults -> `$encrypted$`, but inadvertently modified the originating model due to shared references see: https://github.com/ansible/ansible-tower/issues/7769	2017-11-13 13:01:56 -05:00
AlanCoding	33574d70c8	do not propogate cancel of inventory sync back up to project	2017-11-13 08:44:00 -05:00
Ryan Petrello	bc705ad8ce	Merge pull request #574 from ryanpetrello/fix-7764 ... properly perform validation on encrypted survey defaults	2017-11-10 12:07:54 -05:00
Ryan Petrello	78961c8037	properly perform validation on encrypted survey defaults ... see: https://github.com/ansible/ansible-tower/issues/7764	2017-11-10 10:52:09 -05:00
Alan Rominger	e22486ada8	Merge pull request #573 from AlanCoding/7765 ... [3.2.2] fix bug of system auditor 404 viewing job	2017-11-08 11:16:28 -05:00
AlanCoding	0051da95c9	fix bug of system auditor 404 viewing job	2017-11-08 10:44:41 -05:00
Ryan Petrello	122142c040	Merge pull request #572 from ryanpetrello/isolated-debug-toolkit ... add some useful tools for isolated connectivity debugging	2017-11-08 10:08:05 -05:00