8427 Commits

Author SHA1 Message Date
Chris Meyers
244d1ac73d keystone dep fix 2016-02-23 11:47:26 -05:00
Matthew Jones
39c942e98b Adding migration and base notification type 2016-02-23 11:20:08 -05:00
Matthew Jones
4928badd3f Add a periodic administrative notification 2016-02-23 10:59:08 -05:00
Chris Meyers
1915347aff fix req 2016-02-23 10:32:39 -05:00
Wayne Witzel III
21482fc294 Merge pull request #1011 from anoek/rbac
Initial RBAC API implementation
2016-02-23 10:24:03 -05:00
Matthew Jones
ab3669efa9 Refactor message generator
* Job object can now control the output and generate K:V output for
  notification types that can support it
* Notifications store the body as json/dict now to encode more
  information
* Notification Type can further compose the message based on what is
  sensible for the notification type
* This will also allow customizing the message template in the future
* All notification types use sane defaults for the level of detail now
2016-02-22 17:09:36 -05:00
Akita Noek
9be9cf9b72 Fixed RBAC migration tests considering new signal handlers that are a bit too helpful during testing
We have some signal handlers now that perform work that do work
automatically that we want to explicitly test in our migration path, so
we have to undo some things in order to test the migration code.
2016-02-22 16:50:13 -05:00
Akita Noek
73b2105a30 Switch to using const's for system admin / system auditor singleton names 2016-02-22 16:27:11 -05:00
Akita Noek
26dc430c59 Look for and report on transaction errors within our implicit RBAC fields
When a transaction is in a failed state these fields will not be able to
create new role/resource entries. This check just makes it easier to see
what's going on and aids in debugging.
2016-02-22 16:25:09 -05:00
Akita Noek
b08809f7cc Initial RBAC API implementation 2016-02-22 16:21:56 -05:00
Michael Abashian
00a41ef2b9 Removed a lot of LogViewer related logic since stdout is no longer a modal. Moved the LogViewerHelper to StandardOutHelper. 2016-02-22 15:33:39 -05:00
Akita Noek
dce474ec5e get_absolute_url implemenation for Role 2016-02-22 14:55:32 -05:00
Akita Noek
5071dba4ff Moved RBAC get_permissions implemenation to the Resource model
I had need to perform this query right on a Resource, so I moved it from
the mixin to the Resource
2016-02-22 14:54:27 -05:00
Akita Noek
7d4b54a651 Fixed __all__ def 2016-02-22 14:52:57 -05:00
Chris Meyers
d70615efbd bring back meta choice options lost in upgrade
* status and launch_type OPTIONS choices were lost in the django + drf
upgrade. This brings them back.
2016-02-22 12:58:35 -05:00
Leigh Johnson
6fa10deb8a #999 move adhoc form to inventoryManage state, #951 fix styling & undefined fields of adhoc form 2016-02-22 11:29:20 -05:00
Akita Noek
0ff94e424d SubList views can now resolve deep relationships using dot notation for relationship specification
Made it so you can specify a relationship like 'parent.somelist'
2016-02-22 11:07:32 -05:00
Matthew Jones
718a9c2a97 Fix up some merge requirements conflicts 2016-02-22 10:21:34 -05:00
Matthew Jones
c3121211c3 Merge branch 'release_2.4.4' into devel
* release_2.4.4: (35 commits)
  Update changelog for 2.4.4 release
  Make pycompile non-fatal during deb build
  Revert "Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools"
  Roll back mock version due to packaging issues
  Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools
  change to warning behavior
  Resolve bug when building with /bin/sh on Ubuntu
  Attempt to workaround pip install issue
  point at packages with source on pypi
  Mock requires a newer setuptools when building requirements
  requests needs openssl
  Properly set the shell during directory migration
  pyrax bumpb new python license
  Typo's are bad and should be vanquished
  Conditionally install 2.6 python requirements
  separate pip requirements file for python2.6
  Added missing 'skipped' field for no_log
  Obey no_log even more when using ansible 2.0
  bump shade from 0.5.0 to 1.4
  RHEL5 compatibility and handling of error scenarios
  ...
2016-02-22 10:09:47 -05:00
Ken Hoes
5c049d37a6 Lookup modal styling to match given design 2016-02-22 10:00:50 -05:00
Matthew Jones
60c64d9fe8 Merge branch 'release_2.4.4' into stable
* release_2.4.4: (35 commits)
  Update changelog for 2.4.4 release
  Make pycompile non-fatal during deb build
  Revert "Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools"
  Roll back mock version due to packaging issues
  Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools
  change to warning behavior
  Resolve bug when building with /bin/sh on Ubuntu
  Attempt to workaround pip install issue
  point at packages with source on pypi
  Mock requires a newer setuptools when building requirements
  requests needs openssl
  Properly set the shell during directory migration
  pyrax bumpb new python license
  Typo's are bad and should be vanquished
  Conditionally install 2.6 python requirements
  separate pip requirements file for python2.6
  Added missing 'skipped' field for no_log
  Obey no_log even more when using ansible 2.0
  bump shade from 0.5.0 to 1.4
  RHEL5 compatibility and handling of error scenarios
  ...
2016-02-22 09:49:04 -05:00
Akita Noek
1e1f49c3eb Initial unit tests for core rbac functionality 2016-02-22 09:44:00 -05:00
Akita Noek
80476cbb2a Automatically add/remove user to the member_role when a user is added to / removed from a team 2016-02-22 09:44:00 -05:00
Akita Noek
aa3a33447e Automatically add users with is_superuser to System Admin role
Also fixed issue with System Admin role name not being set and made some
constants for the singleton names we use
2016-02-22 09:44:00 -05:00
Akita Noek
161f4f22cf Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-02-22 09:37:14 -05:00
Michael Abashian
5ee78d7fec Merge pull request #1000 from mabashian/stdout-breadcrumbs
Added breadcrumbs to stdout pages
2016-02-22 08:44:14 -05:00
Matthew Jones
eb3d663d18 Support notification password field encryption
Modify encrypt_field and decrypt_field to support sub-fields under a
dictionary object.  It still uses the parent key when encrypting.
2016-02-21 23:11:17 -05:00
Wayne Witzel III
dcb378fff9 Merge pull request #974 from wwitzel3/rbac
RBAC Testing Fixes
2016-02-19 16:39:28 -05:00
Michael Abashian
fa29608f50 Configured standard out breadcrumbs for adhoc, inventory sync, management jobs and scm updates. 2016-02-19 16:17:16 -05:00
Wayne Witzel III
fa1137d371 Use TransactionTestCase with Django 1.8+ 2016-02-19 15:05:07 -05:00
Jared Tabor
30633cc82e Merge pull request #998 from jaredevantabor/job-detail-results
Job detail results
2016-02-19 10:47:07 -08:00
Jared Tabor
93719094ea Using aliases for colors instead of hard coded pigments 2016-02-19 10:39:17 -08:00
Jared Tabor
68f619e358 Job Detail Results panel tweaks after UX review 2016-02-19 10:23:18 -08:00
Michael Abashian
fffa590a82 Merge pull request #994 from mabashian/stdout-results
Added standard out details to inventory sync, management jobs and scm updates
2016-02-19 13:02:48 -05:00
Leigh Johnson
5f75fa9b46 #696 remove logging pt. 2 2016-02-19 12:04:09 -05:00
Leigh Johnson
247c78c44d #696 clean up logging 2016-02-19 10:59:58 -05:00
Michael Abashian
81e044c97c Added standard out details to inventory sync, management jobs and scm updates. 2016-02-19 10:41:17 -05:00
Leigh Johnson
eae92f8751 delete management-jobs/schedule, create management-jobs/scheduler, add ui-router states, update references to state names #696
prep for isFactCleanup test in the view - change the way Schedule.js AddSchedule factory recognizes a management job #696
2016-02-19 10:40:56 -05:00
Jared Tabor
95467a6b97 Restyling of job detail results panel 2016-02-18 19:38:49 -08:00
Wayne Witzel III
fb5369404d (HACK) bump values while we investigate slowness 2016-02-18 15:33:27 -05:00
Jared Tabor
8f1c88e35d adding less file 2016-02-18 12:27:30 -08:00
Akita Noek
d3c620926a Merge pull request #990 from anoek/devel
Updated API test fixtures
2016-02-18 13:37:04 -05:00
Wayne Witzel III
65c20e9de2 use objects instead of _default_manager 2016-02-18 13:36:36 -05:00
Akita Noek
0051464525 Added put,head,options,delete, & patch test fixtures for api related tests 2016-02-18 11:23:31 -05:00
Akita Noek
6aeaec2b76 Switch to resolve in api test fixtures to automatically resolve View's and their arguments
Also changed the signature of the post/get methods to better align with
libraries like `requests`
2016-02-18 11:19:27 -05:00
Michael Abashian
7dbb69dd6d Accidentally included JobDetailController in app.js during my last merge. This is now pulled in via the job detail module. 2016-02-18 10:04:12 -05:00
Wayne Witzel III
30f88b6e30 Added redis in-memory fixture for functional tests 2016-02-18 09:51:32 -05:00
Michael Abashian
ce8f40277c Merge branch 'remove-standalone-stdout' into devel 2016-02-18 09:47:01 -05:00
AlanCoding
6bd5d8553b fix to allow jobs to run in dev server again 2016-02-18 08:34:14 -05:00
Jared Tabor
673611b7bd Merge pull request #985 from jaredevantabor/job-detail-results
Initial restructuring of Job Detail code
2016-02-17 14:25:55 -08:00