zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-23 16:31:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,113 Commits 35 Branches 71 Tags
4c43afda193f9e8835e6a09e5c7690482a1e8684
Commit Graph

12457 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
aaaae87aa7 Remove some environment variables the callback plugin doesn't actually use. 2017-11-14 15:57:49 -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
AlanCoding
0051da95c9 fix bug of system auditor 404 viewing job 2017-11-08 10:44:41 -05:00
Ryan Petrello
91ad0a9f89 add a useful tool for isolated connectivity debugging 2017-11-08 09:27:33 -05:00
Ryan Fitzpatrick
6ea3ecbb26 Merge pull request #567 from rmfitzpatrick/tower_inv_source_filter_wording 
Provide more specificity to Tower inventory filter help text
 2017-11-07 10:55:30 -05:00
Jared Tabor
e87dce023b Merge pull request #568 from jaredevantabor/source-deletion 
When deleting a source, delete the source's groups too
 2017-11-06 11:27:46 -08:00
Matthew Jones
89a05e9bbc Handle json decoder errors from tower inventory source 2017-11-06 14:15:53 -05:00
Jared Tabor
e70d377a53 feedback from PR: launch both DELETE calls at the same time 
for both groups and hosts.
 2017-11-03 16:26:00 -07:00
Jared Tabor
f65ef9f75c prolong removing the delete modal until after the list refreshes, post-delete 2017-11-03 15:25:39 -07:00
Wayne Witzel III
1a5b5c32b8 Handle ProgrammingError in squashed helpers 2017-11-03 10:34:25 -04:00
Wayne Witzel III
d7f4707044 Handle programming error when evaluating the replaces list for 320 2017-11-03 08:53:53 -04:00
Jared Tabor
9d39ac83f9 When deleting a source, delete the source's groups too 2017-11-02 15:59:09 -07:00
Wayne Witzel III
2f86774006 3.2.0 should not have any replacements defined unless 0005a or 0005b migrations have been run previously 2017-11-02 16:11:45 -04:00
Ryan Fitzpatrick
e2c63c41e7 Provide more specificity to Tower inventory filter help text 2017-11-02 15:01:03 -04:00
Wayne Witzel III
f9685717b8 Move post 3.0 migrations to pre 3.1 position in migration files 2017-11-02 14:06:36 -04:00
Wayne Witzel III
47a3ba9bd5 Rename squash 300 to 30 2017-11-02 14:06:36 -04:00
Wayne Witzel III
af3e6f792c Rename squash 310 to 31 2017-11-02 14:06:35 -04:00
Wayne Witzel III
fc56a1c170 Fix 3.0 to 3.2 migration paths 2017-11-02 14:06:35 -04:00
Wayne Witzel III
84fb908261 Fix 3.1 to 3.2 migration paths 2017-11-02 14:06:33 -04:00
John Mitchell
9518c38bb8 add close logic to clicking outside of the bounds of a lookup modal 2017-11-02 12:20:53 -04:00
Matthew Jones
5e37d6ea7e Remove unused TOWER_HOST and AWX_HOST env vars 
These were conflicting with the new Tower credential
 2017-11-02 10:44:06 -04:00
jlmitch5
b8ed41fa82 munge placeholder from select2 typeahead search bar 2017-10-31 14:39:25 -04:00
Michael Abashian
fbd03287ea Merge pull request #549 from mabashian/7697-smart-inv-pagination 
Only pass host filter param to smart inv shortcut form
 2017-10-31 13:29:52 -04:00
Michael Abashian
7919433288 Merge pull request #548 from mabashian/7752-host-list 
Fixed related host list linking
 2017-10-31 13:29:35 -04:00