Akita Noek
d07da55eac
fix merge fail
2016-03-24 13:54:03 -04:00
Akita Noek
5baa784ce2
Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel
2016-03-24 13:51:00 -04:00
Akita Noek
683f9cacbb
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-24 13:34:31 -04:00
Akita Noek
9baaa83302
Add explicit transaction=True to some tests for jenkins test environment
2016-03-24 13:33:51 -04:00
Akita Noek
f0740794c5
Better implementation of RoleUsersList queryset
2016-03-24 13:30:47 -04:00
Wayne Witzel III
f9770e2398
Merge pull request #1299 from wwitzel3/rbac
...
deprecate Credential.team/user
2016-03-24 13:29:24 -04:00
Akita Noek
bbef9b896f
Removed RoleAccess queryset capabilities; add explicit can_read implemenation
...
We can probably make this into a query set if we're ever interested, but
so far we just use can_read so better to have an explicit implemenation
2016-03-24 13:27:57 -04:00
Akita Noek
2a446d206e
Fix for RoleAccess queryset
2016-03-24 13:05:16 -04:00
Wayne Witzel III
c4c2d08042
Fixup API and old tests for credential access
2016-03-24 11:50:27 -04:00
Akita Noek
1a96d9705f
Merge pull request #1294 from anoek/rbac
...
Various updates for tests on RBAC branch
2016-03-24 11:13:22 -04:00
Akita Noek
922da6ed7a
whitespace
2016-03-24 11:06:03 -04:00
Akita Noek
6653a1e747
Validate that user provides a valid organization when posting a project
2016-03-24 11:03:42 -04:00
Wayne Witzel III
20aa8c02d1
Added accessible_by/objects support for Team
2016-03-24 10:45:49 -04:00
Akita Noek
eccb50a253
Fixed projects creation api endpoints to take organization
2016-03-24 10:22:25 -04:00
Akita Noek
342747866e
flake8
2016-03-24 08:59:12 -04:00
Ken Hoes
23ae408e56
Fixed merge wonkiness, added back in groups query string to route
2016-03-24 08:45:27 -04:00
Ken Hoes
d6c13043bd
Inventory modularization, manage inventory groups/hosts
...
Hosts mostly working, groups directive scaffold in place, rerouting.
Groups edit mostly working.
Source populating in group edit. Pre cleanup.
Cleanup and fresh routing fixed.
2016-03-24 08:45:27 -04:00
Ken Hoes
632f3ca567
More route work and directive
2016-03-24 08:45:27 -04:00
Ken Hoes
66b96ced38
Manage hosts directive set up w/ route
2016-03-24 08:45:27 -04:00
Ken Hoes
a76b361f18
Removed artifacts from merge
2016-03-24 08:45:27 -04:00
Ken Hoes
d24ab43c99
Set up inventory module and split apart controllers/inventory.js into more manageable chunks.
2016-03-24 08:45:27 -04:00
Ken Hoes
6ee654c879
Removed unused job templates import from some controllers
2016-03-24 08:45:27 -04:00
Ken Hoes
b0b416341d
Further modularization.
2016-03-24 08:45:27 -04:00
Ken Hoes
989cf4d1ae
Set up inventory module and split apart controllers/inventory.js into more manageable chunks.
2016-03-24 08:45:27 -04:00
Akita Noek
50a2fac465
Fixed some deprecated Team.projects fallout
2016-03-23 22:53:53 -04:00
AlanCoding
39f444836b
flake8 fix
2016-03-23 17:25:27 -04:00
AlanCoding
02b7149cad
Org counts in detail view and test
2016-03-23 17:13:43 -04:00
Alan Rominger
dd977c608b
Merge pull request #1279 from AlanCoding/822_keystone_v3_OS_cred
...
Add OpenStack V3 credential type
2016-03-23 16:45:42 -04:00
Akita Noek
d838753e60
Fixed up tests from deprecation of Team.projects
2016-03-23 16:25:23 -04:00
Akita Noek
90424eb4b0
Removed pirate debugging statement
2016-03-23 16:24:50 -04:00
mabashian
9e3d4a99d2
Added logic to not show the loop summary events in the UI by looking at event_data.event_loop.
2016-03-23 15:58:27 -04:00
Wayne Witzel III
9d5d3b4131
Rename instead of Add/Remove
2016-03-23 15:47:24 -04:00
Graham Mainwaring
ba916ed25f
Preliminary EL6 SCL Python 2.7 support
2016-03-23 15:46:00 -04:00
Akita Noek
201e4a9ca3
Mark some currently non-functional tests as skipped until they're implemented
...
re #1254
2016-03-23 15:34:20 -04:00
Akita Noek
b263f25911
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-23 15:30:37 -04:00
Akita Noek
de114336ef
Merge branch 'rbac' of github.com:anoek/ansible-tower into rbac
2016-03-23 15:30:33 -04:00
Akita Noek
4aa1602255
Deprecated Team.projects and Project.teams relations, switching to using RBAC
2016-03-23 15:30:03 -04:00
Wayne Witzel III
a5deb66878
deprecate Credential.team/user
2016-03-23 15:23:12 -04:00
Akita Noek
8db915794d
Merge pull request #1298 from AlanCoding/1254_org_counts_update
...
Update organization counts for RBAC branch
2016-03-23 15:15:17 -04:00
AlanCoding
e7d36299be
redesign of organization counts for RBAC branch
2016-03-23 14:56:31 -04:00
Akita Noek
9dbe9fb7ad
Moved a couple of test cases from old/projects.py tests to new test_projects.py tests
2016-03-23 14:47:01 -04:00
Akita Noek
9574c3b506
whitespace
2016-03-23 13:36:28 -04:00
Akita Noek
8afa10466f
Fix ad_hoc.py tests again
...
Credential fix
2016-03-23 12:09:04 -04:00
Matthew Jones
f2284a0098
Handle runner items from ansible v2
...
Also denote whether the trailing runner_on_ was a loop event
2016-03-23 11:38:11 -04:00
Akita Noek
7fa47c1b38
Merge branch 'rbac' of github.com:anoek/ansible-tower into rbac
2016-03-23 11:34:09 -04:00
Akita Noek
573e8e1151
Marking some job_monolithic tests to skip until we want to fully port them
...
Tracking the port in #1296
2016-03-23 11:30:33 -04:00
Akita Noek
7eac303ec7
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-23 09:32:31 -04:00
Leigh
817ea4861b
Merge pull request #1284 from leigh-johnson/JobDetailModalRestyle
...
Remove HostEventsViewer and refactor into job-details/host-events module
2016-03-23 09:15:20 -04:00
Akita Noek
68bb342fe9
flake8
2016-03-22 22:25:50 -04:00
Akita Noek
fc25cb7e95
More .all() fixes re active flag removal
2016-03-22 22:23:32 -04:00
