Wayne Witzel III
7354d1da2c
Fix test_coverage make target
2016-03-22 09:46:46 -04:00
Wayne Witzel III
99ca2efc4f
Update Makefile, no more fact/tests
2016-03-22 09:31:11 -04:00
Wayne Witzel III
5313d2fcb0
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-22 09:24:56 -04:00
Akita Noek
3bcabec2a3
Print garbage cleanup
2016-03-22 08:55:18 -04:00
Akita Noek
d8f527429c
flake8 fixes
2016-03-22 08:05:04 -04:00
Akita Noek
7d932b6633
Add missing .all() from filter removal
2016-03-21 22:29:16 -04:00
Akita Noek
c7234f42c7
Give SU's access to all projects to protect against unreachable orphans
2016-03-21 22:28:05 -04:00
Akita Noek
7ca516da0b
Misc fixes for old projects tests
2016-03-21 22:17:16 -04:00
Akita Noek
b111484b89
old users tests: deprecated_userse -> member_role.members changes
2016-03-21 22:16:54 -04:00
Akita Noek
8c403cf77f
Fixed SU project access
2016-03-21 22:15:08 -04:00
Akita Noek
173ae3b2db
Fixed deprecated_teams relation, and typos
2016-03-21 22:14:39 -04:00
Akita Noek
54cf4b6e02
Grant project access to teams through role parenting
2016-03-21 22:13:12 -04:00
Akita Noek
e4a1a9c3bf
Fixed user/:id/projects after ripping out Team.users
2016-03-21 22:09:55 -04:00
Akita Noek
01e16f6722
Fixed user/:id/teams endpoint after ripping out Team.users
2016-03-21 22:09:18 -04:00
Akita Noek
6d62fbc541
Add test for most recent rbac m2m binding fail
2016-03-21 21:09:58 -04:00
Akita Noek
ec851492d6
Fixed Role m2m binding so it even works all the time
2016-03-21 21:09:22 -04:00
Akita Noek
4bb2f27fe5
Prefixed User.organizations and User.admin_of_organizations with deprecated_
2016-03-21 15:43:58 -04:00
Akita Noek
91690a0eb7
Removed deprecated use of admin_of_organizations
2016-03-21 15:43:21 -04:00
Matthew Jones
f286dc7486
Fix an issue with the email notifier
...
Incorrect body format assumptions in the email notifier
2016-03-21 15:40:41 -04:00
Akita Noek
b46bdef732
Ported old/organizations.py tests to new rbac system
2016-03-21 15:35:08 -04:00
Akita Noek
a5c355d753
Updated UserAccess to reflect new visibility requirements (and work)
2016-03-21 15:08:10 -04:00
Graham Mainwaring
f35655ed48
Merge branch 'python27_el6' of github.com:ghjm/ansible-tower into python27_el6
...
Conflicts:
tools/docker-compose/start_development.sh
2016-03-21 12:18:34 -04:00
Graham Mainwaring
1e8e53e811
Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6
...
Conflicts:
packaging/rpm/ansible-tower.spec
tools/docker-compose/start_development.sh
2016-03-21 12:13:50 -04:00
Graham Mainwaring
1427fee442
Add script wrapper to establish Tower SCL and venv before running Python
2016-03-21 12:11:19 -04:00
Graham Mainwaring
9bd1520efb
Builds an RPM for EL6 with SCL python27 and httpd24
2016-03-21 12:11:19 -04:00
Matthew Jones
46bbc83d0d
Changes for Tower virtualenv support
...
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
2016-03-21 12:11:19 -04:00
Graham Mainwaring
f5308d114a
Merge
2016-03-21 12:07:31 -04:00
Graham Mainwaring
54dee33cc7
Add script wrapper to establish Tower SCL and venv before running Python
2016-03-21 11:47:19 -04:00
Graham Mainwaring
dbb560dc5e
Builds an RPM for EL6 with SCL python27 and httpd24
2016-03-21 11:47:19 -04:00
Matthew Jones
c7e33d0471
Changes for Tower virtualenv support
...
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
2016-03-21 11:47:19 -04:00
Leigh Johnson
3ada60d7d4
Host Events - exclude changed events from ok filter #1132
2016-03-20 14:17:08 -04:00
Leigh Johnson
7c1efea037
add onExit & onEnter hooks to $stateExtender, raze HostEventViewer and replace with host-events module, resolves #1132
2016-03-19 19:36:15 -04:00
AlanCoding
fcc02f7678
rebase and rename migrations corresponding to devel change
2016-03-18 16:45:06 -04:00
AlanCoding
f4b1de766d
Adding OpenStack v3 cred type
2016-03-18 16:41:09 -04:00
AlanCoding
c807d5dcf3
Add keystone v3 support via new domain field on credential
2016-03-18 16:41:09 -04:00
Akita Noek
80560fffc9
Merge pull request #1283 from anoek/rbac
...
Fixed up migrations
2016-03-18 16:33:24 -04:00
Akita Noek
edabf23c6a
Merge pull request #1282 from anoek/devel
...
Renamed migrations to be a little more descriptive
2016-03-18 16:32:26 -04:00
Akita Noek
e4948f210f
Fixed up migrations
2016-03-18 16:31:53 -04:00
Akita Noek
92df6b0fb2
Merge branch 'devel' into rbac
2016-03-18 16:26:45 -04:00
Akita Noek
8addccd434
Renamed migrations to be a little more descriptive
...
Mainly for sanity when merging migrations into long running branches..
but nice anyways I think
2016-03-18 16:17:58 -04:00
Akita Noek
5a444d4b2c
Merge pull request #1281 from anoek/rbac
...
Merging devel into rbac
2016-03-18 15:43:48 -04:00
Akita Noek
54aa465448
Merge remote-tracking branch 'ansible/rbac' into rbac
2016-03-18 15:42:58 -04:00
Akita Noek
beb4f95fa6
Merge remote-tracking branch 'ansible/rbac' into rbac
2016-03-18 15:42:06 -04:00
Akita Noek
9dc4f3e07d
Merge pull request #1280 from anoek/rbac
...
Refactored ImplicitRoleField
2016-03-18 15:41:54 -04:00
Akita Noek
5741b47c54
Merge remote-tracking branch 'ansible/devel' into merge-devel
2016-03-18 15:40:13 -04:00
Akita Noek
4fac1e96f4
Test that helps test the implemenation of role auto-reparenting
2016-03-18 15:11:13 -04:00
Akita Noek
23f0286669
Refactored ImplicitRoleField to be faster and avoid some bad looping cases
...
The role creation logic was a bit too lazy and caused some looping when
using other roles as parent roles. This refactor does all role
creation for a single model instance up front together, which helps
avoid these situations as well as eliminates some extra db updates and
inserts that would happen the old way.
2016-03-18 15:10:08 -04:00
Chris Meyers
69b2a3c868
Merge pull request #1275 from chrismeyersfsu/playbook_state_admin_password
...
desired state pattern for admin_password
2016-03-18 11:32:53 -04:00
Chris Meyers
523e3b7933
Merge pull request #1277 from chrismeyersfsu/playbook_fix_redis
...
fixes bringup redis
2016-03-18 11:32:40 -04:00
Wayne Witzel III
752416f4d8
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-18 11:21:13 -04:00
