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
12,848 Commits 40 Branches 19 Tags 380 MiB
b033319fff
Commit Graph

12848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Abashian
b033319fff Fixed bug with REVERT button display 2017-06-05 15:41:42 -04:00
Michael Abashian
068473bdac Added the ability to select extra credentials when launching a job template with ask_extra_credentials_on_launch is true. Added extra credentials to job results panel 2017-06-05 15:20:40 -04:00
Jake McDermott
e1a0eec29f fix request urls used for settings view (#6451) 2017-06-05 10:41:27 -04:00
Ryan Petrello
2cb296d28b Merge pull request #6408 from ryanpetrello/fix-6406 
clarify valid CredentialType field types
 2017-06-02 10:04:04 -04:00
Ryan Petrello
af457ad8eb clarify valid CredentialType field types 
almost all of our current credential values are strings, but under the
v1 Credential model, `authorize` is boolean

additionally, if a field is specified with no type, fall back to
`string` as a default (this is almost always what people creating custom
types will want)

see: #6406
 2017-06-01 13:23:51 -04:00
Ryan Petrello
f05a97e4ff Merge pull request #6416 from ryanpetrello/fix-6414 
fix a 500 error in `/api/v1/credentials/` backwards compat
 2017-06-01 12:57:53 -04:00
Ryan Petrello
fd4b86349c fix a 500 error in /api/v1/credentials/ backwards compat 
see: #6414
 2017-06-01 11:26:18 -04:00
Ryan Petrello
e7d1e2d3a4 Merge pull request #6368 from ryanpetrello/fix-6363 
resolve a few Credential.inputs validation issues
 2017-06-01 10:09:58 -04:00
Ryan Petrello
e0a629db58 improve error formatting for jsonschema failures on Credential.inputs 
this provides error messages keyed by input fields, so that instead of
e.g.,

{
    'inputs': ['Invalid certificate or key: u'XYZ']
}

...you get:

{
    'inputs': {
        'ssh_key_data': ['Invalid certificate or key: u'XYZ']
    }
}

Includes /api/v1/ compatability for error message format.  Requests to
/api/v1/ will get:

{'ssh_key_data': ['Invalid certificate or key: u'XYZ']}
 2017-06-01 09:48:42 -04:00
Ryan Petrello
98fa654be2 enforce dict for credential API input payloads 
see: #6363
 2017-06-01 09:19:21 -04:00
Chris Meyers
eb6e598f6c add insights_credential to summary fields on inventory 2017-06-01 08:47:21 -04:00
Ryan Petrello
16f4eb4532 Merge pull request #6403 from ryanpetrello/fix-6380 
OpenStack CredentialType needs a `domain` input field
 2017-05-31 17:36:51 -04:00
Ryan Petrello
b0c8d55238 Merge pull request #6402 from ryanpetrello/fix-6372 
fix incorrect AWS Credential Type labels
 2017-05-31 17:36:33 -04:00
Ryan Petrello
995683c9b2 Merge pull request #6401 from ryanpetrello/fix-6394 
add more context for default extra_credentials to the JT launch endpoint
 2017-05-31 17:36:15 -04:00
Aaron Tan
a993025e0d Merge pull request #6053 from jangsutsr/named_url 
Named URL
 2017-05-31 17:02:42 -04:00
Ryan Petrello
23a1c94d38 OpenStack CredentialType needs a domain input field 
see: #6380
 2017-05-31 13:44:38 -04:00
Ryan Petrello
2d0ae56d94 fix incorrect AWS Credential Type labels 
see: #6372
 2017-05-31 13:29:22 -04:00
Ryan Petrello
34b4270b1c add more context for default extra_credentials to the JT launch endpoint 
see: #6394
 2017-05-31 13:22:46 -04:00
Aaron Tan
5af5f50797 Merge pull request #6397 from jangsutsr/6347_fix_usage_of_tacacs_api 
Fix tacacs API usage
 2017-05-31 13:11:28 -04:00
Aaron Tan
f25391fe86 Implement named URL feature. 2017-05-31 12:09:54 -04:00
Aaron Tan
3094527759 Fix usage of tacacs API 2017-05-31 11:49:03 -04:00
Aaron Tan
518baee5ba Merge pull request #6389 from jangsutsr/6343_add_url_and_type_fields_to_instances 
Add URL and type fields to instances/instance groups
 2017-05-31 09:40:55 -04:00
Aaron Tan
604243428c Add URL and type fields to instances/instance groups. 2017-05-30 17:00:27 -04:00
Alan Rominger
a1963024c6 Merge pull request #6378 from AlanCoding/queue_cmd_help 
Gracefully handle certain instance group tower-manage scenarios
 2017-05-30 16:30:11 -04:00
AlanCoding
198b3f0a94 handle user corner cases related to instance group commands 2017-05-30 15:49:48 -04:00
Aaron Tan
b049d624ad Merge pull request #6374 from jangsutsr/6352_fix_500_when_deleting_user 
Update remove_tower_source.py to reflect sso model changes
 2017-05-30 15:40:31 -04:00
Aaron Tan
da24ef0dba Update remove_tower_source to reflect sso model changes. 2017-05-30 15:14:11 -04:00
Michael Abashian
0279163686 Merge branch 'mabashian-inventories-refactor' into devel 2017-05-30 15:05:58 -04:00
Michael Abashian
641823e82e Merge branch 'inventories-refactor' of https://github.com/mabashian/ansible-tower into mabashian-inventories-refactor 
# Conflicts:
#	awx/ui/client/src/inventories/sources/add/sources-add.controller.js
#	awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js
#	awx/ui/client/src/inventories/sources/list/sources-list.controller.js
 2017-05-30 15:05:35 -04:00
Michael Abashian
e8573179c5 Removed console.log 2017-05-30 14:12:57 -04:00
Michael Abashian
e9f4c4f7b5 Removed extraTemplate lines. They are not used 2017-05-30 13:43:43 -04:00
John Mitchell
dc9eb51959 fix variable setup for certain inventory source types 2017-05-30 13:32:17 -04:00
Aaron Tan
1eca41ce92 Merge pull request #6332 from jangsutsr/5943_simplify_tower_config_help_texts 
Simplify Tower configuration help texts
 2017-05-29 10:16:38 -04:00
Wayne Witzel III
01471e02bb Merge pull request #6358 from wwitzel3/issue-6099 
Add smart_inventories endpoint to Host
 2017-05-26 14:24:01 -04:00
Chris Meyers
1a10205e0c Merge pull request #6300 from chrismeyersfsu/feature-insights_proxy 
insights proxy
 2017-05-26 14:17:04 -04:00
Chris Meyers
441946d332 add v1 vs. v2 inclusion/exclusion 2017-05-26 14:04:15 -04:00
Michael Abashian
01b9eb9127 Update smart host field label based on feedback 2017-05-26 13:00:35 -04:00
jlmitch5
b12f0d8823 Merge pull request #6350 from jlmitch5/scmInvSourceUi 
add scm inv source ui
 2017-05-26 12:16:25 -04:00
John Mitchell
4fcfac3137 updates to jshint and groups language to inventory_source 2017-05-26 11:56:14 -04:00
Matthew Jones
da5ef30b6a Swap out dumb-init for tini 
This seems to be less intrusive and less noisy of a pid 1
 2017-05-26 11:33:14 -04:00
Wayne Witzel III
d846e352ab minor doc typo 2017-05-26 10:19:47 -04:00
Wayne Witzel III
e28cd97ffb Add smart_inventories endpoint to Host 2017-05-26 10:16:12 -04:00
Chris Meyers
b25b397e14 remove insights logic from backwards compat logic 
* spelling fixes
 2017-05-26 09:58:20 -04:00
Chris Meyers
2f43f0fe2b flake8 2017-05-26 08:52:13 -04:00
Chris Meyers
7c0513d5ee migrate insights credentials 
* A credential is considered an insights credential if a project of
scm_type 'insights' is associated.
* all non-insights Projects that point at an insights credential are
nulled
 2017-05-26 08:50:53 -04:00
Chris Meyers
87eea59845 add per-inventory insights credential 2017-05-26 07:25:36 -04:00
Chris Meyers
ca1eb28d1f don't assume insights id is a uuid 2017-05-25 17:52:46 -04:00
Bill Nottingham
5232b70897 Merge pull request #6338 from wenottingham/yes-we-are-enablers 
[RFC] Allow setting enabled/disabled and other flags for custom inventory sources
 2017-05-25 17:27:49 -04:00
Michael Abashian
32f8c0bfaf Merge pull request #6345 from mabashian/5964-apiv1-hard-coding 
Replaced all hard-coded api/v1 references with dynamic references or with v2
 2017-05-25 17:15:36 -04:00
Michael Abashian
1e06e1d939 Refactored a lot of the rbacUiControlService out of the controller and into the resolve block of the state 2017-05-25 17:09:27 -04:00