shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity
14,934 Commits 40 Branches 19 Tags 380 MiB
cc8b115c6a
Commit Graph

14934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Tan
cc8b115c6a Fix SAML auth behind load balancer issue. 
Relates to #7586 of ansible-tower as a follow-up of fix #420 of tower.

The original fix works for Django version 1.9 and above, this PR
expanded the solution to Django verison 1.8 and below.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-10 14:38:47 -04:00
Ryan Petrello
f2d46baf09 Merge pull request #496 from ryanpetrello/fix-6683 
fix a bug when Tower is integrated with ipsilon SAML server
 2017-10-10 14:38:47 -04:00
Alan Rominger
4f4af058b3 Merge pull request #480 from AlanCoding/committed_cap 
[3.2.2] add IG committed capacity to serializer
 2017-10-10 14:38:46 -04:00
Ryan Petrello
b372cebf8d fix a bug when Tower is integrated with ipsilon SAML server 
https://github.com/ansible/ansible-tower/issues/6683
 2017-10-10 14:38:46 -04:00
Alan Rominger
3df8e2beb1 Merge pull request #494 from AlanCoding/wfjt_perm_fix2 
[3.2.2] fix bug checking WFJT node for prompted resources
 2017-10-10 14:38:46 -04:00
AlanCoding
c45fbcf2ee add IG committed capacity to serializer 2017-10-10 14:38:46 -04:00
Ryan Petrello
5efa50788f Merge pull request #481 from ryanpetrello/fix-7046 
[3.2.2] encrypt job survey data
 2017-10-10 14:38:46 -04:00
AlanCoding
3abbe87e10 fix bug checking WFJT node for prompted resources 2017-10-10 14:38:46 -04:00
Ryan Petrello
9978b3f9ad Merge pull request #489 from ryanpetrello/release_3.2.2 
fix busted 3.2.2 activity stream migration
 2017-10-10 14:38:46 -04:00
Ryan Petrello
f26bdb3e96 migrate existing survey passwords to be encrypted 
see: https://github.com/ansible/ansible-tower/issues/7046
 2017-10-10 14:38:46 -04:00
Ryan Petrello
4be4e3db7f encrypt job survey data 
see: https://github.com/ansible/ansible-tower/issues/7046
 2017-10-10 14:38:46 -04:00
Alan Rominger
4ea92f0dcb Merge pull request #306 from AlanCoding/new_perf_logging 
[3.2.2] new method of performance logging
 2017-10-10 14:38:45 -04:00
Ryan Petrello
a0cfbb93e9 fix busted 3.2.2 activity stream migration 
see: ansible/ansible-tower#7704
 2017-10-10 14:38:45 -04:00
Aaron Tan
08a784d50c Merge pull request #474 from jangsutsr/fix-7386 
Include Tower configurations into activity stream
 2017-10-10 14:38:45 -04:00
AlanCoding
9ee18d02c8 new method of performance logging 2017-10-10 14:38:45 -04:00
Ryan Petrello
4fd190e4c8 Merge pull request #468 from ryanpetrello/smarter-credtype-migrations 
[3.2.2] add new credential types in a more stable way in migrations
 2017-10-10 14:38:45 -04:00
Aaron Tan
a11e33458f Include Tower configurations into activity stream 
Relates #7386 of ansible-tower.

Due to the uniqueness of Tower configuration datastore model, it is not
fully compatible with activity stream workflow. This PR introduced
setting field for activitystream model along with other changes to make
Tower configuration a special case for activity streams.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-10 14:38:45 -04:00
Aaron Tan
84fdfbb898 Merge pull request #469 from jangsutsr/fix-7684 
[3.2.2] Prevent slugify username from social sso backends
 2017-10-10 14:38:45 -04:00
Ryan Petrello
f4a252a331 add new credential types in a more stable way in migrations 
instead of writing individual migrations for new built-in credential
types, this change makes the "setup_tower_managed_defaults" function
idempotent so that it only adds the credential types you're missing
 2017-10-10 14:38:45 -04:00
Ryan Petrello
d4fe60756b Merge pull request #466 from ryanpetrello/ovirt4-inv-source 
don't install pycurl from pypi; use a system package instead
 2017-10-10 14:38:45 -04:00
Aaron Tan
f4ab979b59 Prevent slugify username from social sso backends 
Relates #7684 of ansible-tower.

Slugify username in python-social-auth means disallowing
any non-alphanumerial characters, which is an over-kill
for awx/tower, thus disabling it.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-10 14:38:45 -04:00
Ryan Petrello
3d3d79b6b3 Merge pull request #464 from ryanpetrello/ovirt4-inv-source 
add ovirt sdk dependency for ovirt4 support
 2017-10-10 14:38:44 -04:00
Ryan Petrello
e06d4d7734 don't install pycurl from pypi; use a system package instead 
the ovirt4 sdk relies on pycurl, which is complicated to install w/ pip;
rely on pycurl to be provided by a system package instead
 2017-10-10 14:38:44 -04:00
Ryan Petrello
ab18a4a440 Merge pull request #454 from ryanpetrello/ovirt4-inv-source 
support ovirt4 as a built-in inventory source
 2017-10-10 14:38:44 -04:00
Ryan Petrello
7438062b97 add ovirt sdk dependency for ovirt4 support 2017-10-10 14:38:44 -04:00
Ryan Petrello
4510cd11db Merge pull request #452 from ryanpetrello/fix-7609 
disable GCE inventory caching w/ a .ini file
 2017-10-10 14:38:44 -04:00
Ryan Petrello
74f2509482 support ovirt4 as a built-in inventory source 
see: https://github.com/ansible/ansible-tower/issues/6522
 2017-10-10 14:38:44 -04:00
Ryan Petrello
f84e42ed15 Merge pull request #451 from ryanpetrello/fix-7609 
disable GCE inventory source cache
 2017-10-10 14:38:44 -04:00
Ryan Petrello
94b4dabee2 disable GCE inventory caching w/ a .ini file 
see: https://github.com/ansible/ansible-tower/issues/7609
see: https://github.com/ansible/tower/pull/451#pullrequestreview-64454393
 2017-10-10 14:38:44 -04:00
Ryan Petrello
94d44e8791 disable GCE inventory source cache 
by default, the GCE inventory script caches results on disk for
5 minutes; disable this behavior

see: https://github.com/ansible/ansible-tower/issues/7609
 2017-10-10 14:38:44 -04:00
Ryan Petrello
d24166bd68 Merge pull request #442 from ryanpetrello/fix-7554 
properly encode LDAP DN values on validation
 2017-10-10 14:38:43 -04:00
Ryan Petrello
62f82e7a7e Merge pull request #441 from ryanpetrello/fix-7607 
allow the credential type to be changed for unused credentials
 2017-10-10 14:38:43 -04:00
Ryan Petrello
7a21a45781 properly encode LDAP DN values on validation 
see: https://github.com/ansible/ansible-tower/issues/7554
 2017-10-10 14:38:43 -04:00
Ryan Petrello
91ec0a4482 Merge pull request #430 from ryanpetrello/fix-7620 
don't show polymorphic_ctype in unique validation error messaging
 2017-10-10 14:38:43 -04:00
Ryan Petrello
c8f4320b58 allow the credential type to be changed for unused credentials 
see: https://github.com/ansible/ansible-tower/issues/7607
 2017-10-10 14:38:43 -04:00
Ryan Petrello
71a725c5f8 Merge pull request #432 from ryanpetrello/fix-7513 
add awx meta variables to adhoc command extra_vars
 2017-10-10 14:38:43 -04:00
Ryan Petrello
96572fe3d4 don't show polymorphic_ctype in unique validation error messaging 
see: https://github.com/ansible/ansible-tower/issues/7620
 2017-10-10 14:38:43 -04:00
Ryan Petrello
554a9586c6 add awx meta variables to adhoc command extra_vars 
see: https://github.com/ansible/ansible-tower/issues/7513
 2017-10-10 14:38:37 -04:00
Ryan Petrello
f41c8cf4f2 Merge pull request #426 from ryanpetrello/fix-7655 
don't append to the activity stream on LDAP group disassociate
 2017-10-10 14:38:18 -04:00
Ryan Petrello
f2f42c2c8a don't append to the activity stream on LDAP group disassociate 
for organizations w/ a large number of ldap orgs/teams, this results in
a _huge_ number of extraneous activity stream entries

see: https://github.com/ansible/ansible-tower/issues/7655
 2017-10-10 14:38:18 -04:00
Alan Rominger
70f8ec78de Merge pull request #517 from AlanCoding/vars_exception 
fallback to empty dict when processing extra_data
 2017-10-10 09:30:06 -04:00
AlanCoding
e2c398ade2
fallback to empty dict when processing extra_data 2017-10-10 08:13:45 -04:00
Alan Rominger
7365e4a63f Merge pull request #516 from AlanCoding/abc_migrations 
Fix 3.1.1->3.2.1 migration error
 2017-10-09 16:37:35 -04:00
AlanCoding
d4fc4bcd61
fix migration problem from 3.1.1 2017-10-09 15:49:38 -04:00
AlanCoding
4237b9ed5c
move 0005a migration to 0005b 2017-10-09 15:48:52 -04:00
Alan Rominger
2dd2541550 Merge pull request #507 from AlanCoding/adhoc_word_smithing 
[3.2.2] feedback on ad hoc prohibited vars error msg
 2017-10-06 14:15:16 -04:00
AlanCoding
edda5e5420
feedback on ad hoc prohibited vars error msg 2017-10-06 14:07:38 -04:00
Matthew Jones
721674f0cd Merge pull request #502 from wwitzel3/release_3.2.1 
[3.2.1] Fix broken migration from 3.1.1/3.1.2 -> 3.2.1
 2017-10-06 13:19:34 -04:00
Shane McDonald
f97ca9c42f Fix the way we include i18n files in sdist 2017-10-06 11:57:08 -04:00
Wayne Witzel III
8f883d8d43
Fix migrations to support 3.1.2 -> 3.2.1+ upgrade path 2017-10-06 09:25:43 -04:00