1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Commit Graph

5506 Commits

Author SHA1 Message Date
Chris Meyers
9829d83839 Merge pull request #498 from chrismeyersfsu/fix-delete_when_license_expired
allow multi-org expired licenses to delete orgs
2015-11-13 10:12:44 -05:00
Chris Meyers
97c56d451e allow multi-org expired licenses to delete orgs 2015-11-12 15:33:00 -05:00
Matthew Jones
4832f48e06 Add social log messages to tower's log on error 2015-11-12 13:47:17 -05:00
Chris Church
908b1b4094 Update default scopes requested for github social auth. 2015-11-12 12:27:19 -05:00
Matthew Jones
7f276b03fb Switch to matburt's fork for python social auth
This picks up the change needed for python 2.6 to work
2015-11-11 16:06:37 -05:00
Matthew Jones
5f321ecab6 Emit a warning for unmapped SAML paramters 2015-11-11 16:05:53 -05:00
Matthew Jones
fdc9979595 Fix up some SAML issues
* Fix an issue I created overriding authenticate
* Fix up attribute mapping using an identity provider class.  The
  methods built into django-social-auth for saml are probably not going
  to work.  We also now expose those mappings in a settings attrs map
  that the user can override.
2015-11-10 11:58:42 -05:00
James Laska
60a2787468 Use correct aw_repo_url when building packer 2015-11-06 15:19:35 -05:00
Chris Meyers
c52c7c2f9f Merge pull request #494 from chrismeyersfsu/feature-socket_tests
adds socket tests
2015-11-06 14:39:03 -05:00
Chris Meyers
e928aa40a5 Merge pull request #493 from chrismeyersfsu/feature-git_hook
added git pre commit hook to run flake8
2015-11-06 10:48:38 -05:00
Chris Meyers
3f4913f5ab adds socket tests 2015-11-06 10:30:56 -05:00
Chris Meyers
014419f6ca Merge pull request #492 from chrismeyersfsu/fix-ha_remove
fixes remove_instance error
2015-11-06 07:56:50 -05:00
Chris Meyers
0b4efa3fcd added git pre commit hook to run flake8 2015-11-06 07:38:29 -05:00
Chris Meyers
dbbfde0d25 fixes remove_instance error
* Initialize object attribute to None so a later if check that depends
on that attributes succeeds. The attribute is related to unifying the
command line args to the *_instance command set.
* Added regression test case
2015-11-06 07:19:09 -05:00
Jared Tabor
d8aff34f63 null pointer exception 2015-11-05 11:17:17 -08:00
James Laska
cc0f78102e Merge pull request #489 from jlaska/release_2.4.0
Attach handlers to django_auth_ldap
2015-11-05 12:55:55 -05:00
James Laska
fc8f8811af Resolve issue on precise keeping old debs around
Upgrades on precise kept installing the oldest 2.4.0 package in the pool.  The
following fix appears to correct that problem.
2015-11-05 12:53:15 -05:00
James Laska
4060370fad Attach handlers to django_auth_ldap
To assist with debugging LDAP authentication, associate the 'django_auth_ldap'
handler with the 'tower_warnings' logger.  To enable debugging, set the
following in a tower settings file:

> LOGGING['handlers']['tower_warnings']['level'] =  'DEBUG'

Also uses the proper `filename` for the tower_warnings log file.
2015-11-05 12:53:15 -05:00
James Laska
9ea8dc845e Merge pull request #488 from wenottingham/release_2.4.0
Add PowerShell version of request_tower_configuration. From @nitzmahone.
2015-11-05 12:18:40 -05:00
James Laska
eb95ba94fb Attach handlers to django_auth_ldap
To assist with debugging LDAP authentication, associate the 'django_auth_ldap'
handler with the 'tower_warnings' logger.  To enable debugging, set the
following in a tower settings file:

> LOGGING['handlers']['tower_warnings']['level'] =  'DEBUG'

Also uses the proper `filename` for the tower_warnings log file.
2015-11-05 12:09:39 -05:00
Chris Meyers
5845730cf6 Merge pull request #485 from chrismeyersfsu/fix-openstack_jt
add openstack cred file to env for jt launch
2015-11-05 11:28:26 -05:00
Bill Nottingham
1bd6ffa3c9 Add PowerShell version of request_tower_configuration. From @nitzmahone. 2015-11-05 10:15:37 -05:00
James Laska
abed41d390 Reword log msgs for enterprise_auth failures 2015-11-05 09:50:08 -05:00
Matthew Jones
b2cfd38a1c Update dm.xmlsec.bindings requirement to point to a version with updated cflags 2015-11-04 16:43:06 -05:00
James Laska
71e9ce61e4 Revert "Add CFLAGS when building rhel6 site-packages"
To make this work, we'll also need:

    CFLAGS=-Qunused-arguments

For now, we'll explore forking dm.xmlsec.bindings.

This reverts commit be83561bfe996d5e5b2e291787f2e863fa5b9203.
2015-11-04 16:13:34 -05:00
James Laska
8a97a26aba Add CFLAGS when building rhel6 site-packages
Attempts to resolves https://trello.com/c/DL7MgYyO
2015-11-04 15:58:10 -05:00
jlmitch5
e827963415 Merge pull request #486 from jlmitch5/promiseConfig
Promise config
2015-11-04 15:09:35 -05:00
James Laska
5f3f830232 Fix broken coverage import with older django-jenkins 2015-11-04 10:47:26 -05:00
Matthew Jones
f78f69159d Fix up pyflakes indentation issues 2015-11-04 09:50:50 -05:00
Matthew Jones
ec6ef4974a Update GCE Region Choices per Google 2015-11-03 23:34:46 -05:00
John Mitchell
ecb445e688 dont resolve a promise that hasnt been set up 2015-11-03 22:39:39 -05:00
John Mitchell
e05988ff5d resolve config with a promise on the login route 2015-11-03 21:58:01 -05:00
John Mitchell
688d933df7 fixed admin organization association text 2015-11-03 16:39:54 -05:00
John Mitchell
cf99179015 fixed urls for credentials going to api 2015-11-03 15:48:25 -05:00
Jared Tabor
095f8d349d adding default value for idle modal 2015-11-03 07:45:31 -08:00
Chris Meyers
a0f327e6c5 Merge pull request #484 from chrismeyersfsu/feature-stdout_format
add content encoding for json to stdout
2015-11-03 10:11:24 -05:00
Matthew Jones
a6b2e25680 Merge pull request #483 from ansible/license_warning_and_auth_license_validation
Add logging and improve validation for certain auth backends
2015-11-03 09:54:45 -05:00
Chris Meyers
0889f1ebe1 add content encoding for json to stdout
* content_format=ansi&content_encoding=base64 support added to
?format=json on stdout endpoint.

Currently the json `content` value is made into html.
This change will allow support for consuming STDOUT for display on the
terminal.
2015-11-03 09:38:49 -05:00
Chris Meyers
3a8044754c add openstack cred file to env for jt launch 2015-11-03 09:37:38 -05:00
Jared Tabor
555a8314d6 Checking for valid object in ProcessErrors 2015-11-02 15:57:17 -08:00
James Laska
0ae947660b Pin to older django-jenkins release
The latest django-jenkins release does not support py2.6 or django-1.6.  Lame!
2015-11-02 17:09:37 -05:00
Matthew Jones
99f048dfe5 Add object_association for m2m relationships
Now when displaying a m2m relationship change we'll show the related
field mapping that changed.
2015-11-02 14:39:24 -05:00
John Mitchell
dd5a7bbd62 fixed 403 status on job detail page 2015-11-02 13:39:28 -05:00
Matthew Jones
113c5ed78f Clean up authenticate and get_user for ldap auth 2015-11-02 12:02:14 -05:00
Matthew Jones
dd29bc40d9 Add logging and improve validation for certain auth backends
* Abstract authention to provide a hook for emitting an error message
* Perform some license validation that wasn't present before for
  enterprise licenses
2015-11-02 11:59:17 -05:00
Jared Tabor
045014f3bc posting license after user posts license
then reissue pendo identity
2015-10-29 16:35:09 -07:00
Jared Tabor
861766e513 Adding ansible & tower versions to pendo object
Adding these keys to the account_id object
2015-10-29 14:34:53 -07:00
Jared Tabor
f5bf789cb1 disabling pendo guides
we're not using the pendo guides in this release. This change turns off the outbound requests to pendo to check for guides.
2015-10-29 13:56:31 -07:00
James Laska
69fe474c52 Merge pull request #482 from wenottingham/release_2.4.0
Generate a SHA-256-signed self-signed cert, not a SHA-1 one.
2015-10-29 13:30:29 -04:00
Matthew Jones
2ba7b3bdac Update vendored ec2 module 2015-10-29 13:27:34 -04:00