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

8985 Commits

Author SHA1 Message Date
James Laska
188f81ef3d Update cloudforms dynamic inventory
Pulling the latest from
https://github.com/ansible/ansible/blob/devel/contrib/inventory/cloudforms.py

Related #3168
2016-08-19 15:37:28 -04:00
James Laska
a847495bea Update foreman inventory script
Per request from Red Hat Satellite team, update to the latest foreman.py

https://github.com/theforeman/foreman_ansible_inventory/blob/master/foreman_ansible_inventory.py
2016-08-19 15:37:28 -04:00
Leigh Johnson
fc1ca378d1 Disable permissions tab in Credential > Edit form if Credential is private (#3288)
* disable permissions tab in credential > edit view if credential is private, resolves #3265

* add tooltip indicating why permissions tab is disabled if cred is private
2016-08-18 13:49:05 -04:00
Michael Abashian
b25cf0b5cb Merge pull request #3299 from mabashian/3196-skip-tags-help-text
Tweaked the popover text for job and skip tags on JT add/edit
2016-08-18 11:39:38 -04:00
Michael Abashian
52803d2f04 Tweaked the popover text for job and skip tags on JT add/edit 2016-08-17 16:38:29 -04:00
Akita Noek
19fbe4b7fd Merge pull request #3274 from anoek/3081
Prevent private credentials from being to assigned to teams
2016-08-17 15:57:59 -04:00
Matthew Jones
3beef1d988 Workaround a cascade setnull polymorphic issue
See: https://github.com/django-polymorphic/django-polymorphic/issues/229
2016-08-17 12:55:12 -04:00
Akita Noek
6464f6e3d6 flake8 2016-08-16 15:54:12 -04:00
Akita Noek
91cd32d304 Fixed old test expectations 2016-08-16 15:36:07 -04:00
Akita Noek
9c5c09169e Made it so the credential organization field can't be changed
This makes it so the credential organizaiton field can't be changed
through the API (unless the user is a super user). This brings us into
alignment with the original intent.
2016-08-16 15:32:29 -04:00
Akita Noek
fc7d2b6c4e Skip some unit tests
These tests broke because we added some additional checks that utilize
the database within the role assignment code, and because of issue
parsing or forming requets between the unit framework and the django
request code I'd guess (for some reason it looks like the `pk` field
isn't getting parsed out and handed in to the kwargs of a post method..
didn't dig into it though.)
2016-08-16 14:53:53 -04:00
Akita Noek
30451f230b Fixed org auditor visibility of team credentials
And by fix, I mean prevent us from getting into the situation that was
causing the asymetric visiblity by brining us into alignment with the
original intention and spec for how credentials were supposed behave.

 #3081
2016-08-16 14:02:09 -04:00
Akita Noek
db87e3cb30 Merge branch 'release_3.0.2' into 3081 2016-08-16 13:52:57 -04:00
Aaron Tan
fd26cf6176 Merge pull request #3244 from jangsutsr/3199_ignored_task_result_inconsistent
Prevent ignored task from being displayed as failing.
2016-08-14 20:14:06 -04:00
John Mitchell
5467b233eb fix credential kind options for list 2016-08-12 16:29:11 -04:00
Alan Rominger
e5a1ee8b94 Merge pull request #3215 from AlanCoding/2200_job_survey_pass
Save survey passwords in job as new field
2016-08-12 14:04:29 -04:00
Alan Rominger
b3c8333867 Merge pull request #3230 from ansible/AlanCoding-patch-1
Allow for 201 callback status code
2016-08-12 11:30:11 -04:00
AlanCoding
ba101573d6 interpret any code below 300 as success 2016-08-12 11:25:16 -04:00
Jared Tabor
a7a6aaa8ac Merge pull request #3240 from jaredevantabor/email_notification
Making the username and password fields optional
2016-08-12 07:54:27 -07:00
Jared Tabor
5445940e84 Merge pull request #3243 from jaredevantabor/ec2-inventory-credential
EC2 credential should be optional for an EC2 source group (previously required)
2016-08-12 07:18:31 -07:00
Alan Rominger
95011b1aa0 Merge pull request #3235 from AlanCoding/3234_ev_survey_fix
Fix survey extra_vars processing error
2016-08-12 10:17:40 -04:00
AlanCoding
efb66cad20 bail when status code is over 300 2016-08-12 07:31:01 -04:00
James Laska
ee66fd4aa5 Make CloudForms inventory_script work
Fixes a few flake8 issues while at it.
2016-08-11 18:50:42 -04:00
Aaron Tan
f90b244fe6 Prevent ignored task from being displayed as failing. 2016-08-11 17:34:35 -04:00
Jared Tabor
5e4362da69 making ec2 cred optional on group->edit 2016-08-11 13:09:56 -07:00
Jared Tabor
c21e142929 making ec2 credential optional for ec2 inventory
and fixing the autopopulate for that field (it should not autopopulate)
2016-08-11 12:56:17 -07:00
Akita Noek
3d218d5fca Revert "Fix to ensure org auditors can see team credentials"
This reverts commit 5dcb0e57d80a3bb0553ca8194890a938257a6e93.

New clarification on what the actual desired behavior of this whole
system means this commit is trash, fixing in a much better way.
2016-08-11 11:00:02 -04:00
Akita Noek
f81d6afe83 Fixed team credential list to work with corrected permissions 2016-08-11 10:17:33 -04:00
Jared Tabor
d8c713d5ef Making the username and password fields optional
for email notifications
2016-08-10 14:08:33 -07:00
Akita Noek
d181aefddf Fix to ensure org auditors can see team credentials
#3081
2016-08-10 16:58:39 -04:00
Akita Noek
e55de3d073 Fixed team credential creation through API 2016-08-10 16:58:12 -04:00
Alan Rominger
9ab3aae59d Merge pull request #3225 from AlanCoding/3188_cheap
The easy option to show inventory scripts to org auditors
2016-08-10 16:10:08 -04:00
John Mitchell
5761021f7e fix duplication of credential kind options 2016-08-10 14:50:36 -04:00
Michael Abashian
f9c8559bc2 Merge pull request #3237 from mabashian/3149-adhoc-breadcrumb
Fixed bug where breadcrumb was incorrect after launching adhoc command
2016-08-10 14:34:40 -04:00
kensible
a20e87c046 Merge pull request #3222 from kensible/3185-network-credential-password
Password is no longer required for network credential
2016-08-10 14:23:02 -04:00
kensible
ef32b57267 Merge pull request #3228 from kensible/3193-teams-permissions
Included org in teams listing for differentiation
2016-08-10 14:22:51 -04:00
Chris Meyers
6c0078689c Merge pull request #3236 from chrismeyersfsu/fix-restore
fix restore db
2016-08-10 13:48:49 -04:00
Michael Abashian
8c4a784234 Changed the ng-if's on the breadcrumb elements to ng-show's so that they aren't removed from the DOM. Also removed activity stream logic from the inv manage breadcrumb as the activity stream is not shown on inventory manage. 2016-08-10 11:30:19 -04:00
Matthew Jones
8fcc194c82 Attempt to wait for job host summaries
Sometimes the job host summaries can land a little later after the job
has finished so sometimes events are still filtering in when the
notifications are triggered
2016-08-10 11:30:02 -04:00
AlanCoding
fab0ff18d8 add unit test for survey vars as strings 2016-08-10 11:02:29 -04:00
AlanCoding
a94e97366a fix error processing survey vars 2016-08-10 09:41:04 -04:00
Alan Rominger
c1e340fbd6 allow for 201 status_code from callback 2016-08-09 14:56:19 -04:00
jlmitch5
ea024c7e11 Merge pull request #3182 from jlmitch5/fixSearchDefaults
fix search defaults for lists
2016-08-09 13:53:06 -04:00
Ken Hoes
8f3be99583 Included org in teams listing for differentiation 2016-08-09 13:21:43 -04:00
AlanCoding
53d6d2734f add conditional to show inventory script to org auditors 2016-08-08 17:13:26 -04:00
Alan Rominger
c36dafac3d Merge pull request #3181 from AlanCoding/tests_for_null_tags
Add API test coverage for empty tags and skip_tags
2016-08-08 16:48:47 -04:00
Ken Hoes
59059633ed Password is no longer required for network credential 2016-08-08 14:16:56 -04:00
AlanCoding
6559118f40 tests for saving survey passwords to job 2016-08-08 13:06:07 -04:00
AlanCoding
9f3d9fa78a carry over survey passwords from old relaunched job 2016-08-05 15:59:11 -04:00
AlanCoding
17ac2cee42 Put survey passwords in job field 2016-08-05 15:11:28 -04:00