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

12885 Commits

Author SHA1 Message Date
Ryan Petrello
462b2c6696 improve a few permission-related errors for CredentialType update/delete
see: #6385
2017-05-31 15:48:34 -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
Chris Meyers
0c034f29af use insights etag as a cache
* During insights project updates, if the etag from insights matches the
last etag (scm_revision) then don't get all the maintenance playbooks.
Otherwise, get all the maintenance playbooks and update scm_revision
with the etag.
2017-05-30 18:30:13 -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
Bill Nottingham
e93a61ac53 Allow setting the enabled/disabled flag for more than just cloud inventory sources.
Leverage the same _ENABLED_VAR (and other) variables that exist for cloud sources, and set some defaults for custom scripts.
2017-05-25 16:51:09 -04:00
John Mitchell
6789abbdeb smooth out logic for adding new options to single select to select2 2017-05-25 14:28:07 -04:00
John Mitchell
7f00cfdd5a set the inventory file to pristine on source change 2017-05-25 13:12:40 -04:00
John Mitchell
a229259559 only show text input for add new single-selects 2017-05-25 13:04:09 -04:00
Jared Tabor
fa13557174 Merge pull request #6349 from jaredevantabor/source-notifications
adding notifications to sources edit
2017-05-25 11:54:53 -04:00
John Mitchell
2b37d04204 remove unwanted line 2017-05-25 11:54:26 -04:00
John Mitchell
7a927825ce add scm inv source ui 2017-05-25 11:47:40 -04:00
Jared Tabor
e969c4ecd1 adding notifications to sources edit
take two
2017-05-25 11:42:38 -04:00
Michael Abashian
606a47c324 Merge pull request #6334 from mabashian/5815-inventory-sync
Inventory sync fixes
2017-05-24 17:48:15 -04:00
Michael Abashian
4a08ed333b Only show sync button on inventories with sources 2017-05-24 17:40:28 -04:00
Michael Abashian
b875fd65e1 Replaced all hard-coded api/v1 references with dynamic references or with v2 2017-05-24 17:05:46 -04:00
Michael Abashian
aaf039c23d Merge pull request #6339 from mabashian/inventory-bug-fixes
Various small inventory ux bug fixes
2017-05-24 15:47:55 -04:00
Michael Abashian
d08a67c3f2 Removed commented line 2017-05-24 14:42:55 -04:00