External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity
6,259 Commits 54 Branches 19 Tags
Commit Graph

6259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Graham Mainwaring
ba916ed25f Preliminary EL6 SCL Python 2.7 support 2016-03-23 15:46:00 -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
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
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
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
Chris Meyers
0f99dbe1d2 fixes MONGO_HOST not found error 2016-03-18 10:56:00 -04:00
Chris Meyers
7a2869b0e2 Merge pull request #1274 from ansible/revert-1213-revert-1208-mongoectomy_packaging 
Revert "Revert "remove mongo as packaging req""
 2016-03-18 09:35:10 -04:00
Alan Rominger
8b610d132d Merge pull request #1272 from AlanCoding/container_tower_package 
Tweaks to help development container workflow
 2016-03-18 08:17:54 -04:00
AlanCoding
a0ce6d7a25 fix regression of development package naming 2016-03-17 22:54:12 -04:00
Chris Meyers
9f61cefe0b Merge pull request #1205 from chrismeyersfsu/mongoectomy_playbook 
Mongoectomy playbook
 2016-03-17 10:50:48 -04:00
kensible
cc98c6ce3c Merge pull request #1264 from kensible/688-orgCards-counts 
688 org cards counts
 2016-03-17 10:48:50 -04:00
Ken Hoes
7443487b00 Removed unused routes 2016-03-17 09:18:01 -04:00
Ken Hoes
8ca3a6b2bf Added counts to organizations listing 2016-03-16 13:23:37 -04:00
Matthew Jones
526a6ec7dd Remove unneeded fetch for r/o fields 2016-03-16 13:12:13 -04:00
Matthew Jones
45f95bf2b2 Disallow related elements to be treated as choices 
DRF will try to resolve potential candidates into the OPTIONS endpoint.
This is mainly to support their POST field in the browseable API.   We
don't need this and it can yield some expensive queries so we bypass
generating choices for any RelatedField fields
 2016-03-16 13:11:05 -04:00
Matthew Jones
63b01bb04b Fix up the docker-refresh Makefile target 
This allows you to cleanup the images without requiring a rebuild necessarily
 2016-03-16 13:11:05 -04:00
Ken Hoes
e044617284 Merge branch '1259-organizations-modules' into 688-orgCards-counts 2016-03-16 11:55:21 -04:00
Alan Rominger
96517d2381 Merge pull request #1230 from AlanCoding/647_org_summary_numbers 
Provide counts of organization resources in list view
 2016-03-16 10:07:25 -04:00
kensible
57caec392c Merge pull request #1237 from kensible/1231-lookupModal-specs 
1231 lookup modal specs
 2016-03-16 08:36:51 -04:00
AlanCoding
52cd4f5ef9 reduce test to only check project inventory connection 2016-03-15 15:06:00 -04:00
Ken Hoes
85a9e14ced Split up and modularized organizations 2016-03-15 14:55:12 -04:00
AlanCoding
da39f1269a org counts code restructing to better prepare for RBAC merge 2016-03-15 14:36:56 -04:00
Leigh
dbee95ba8c Merge pull request #1246 from leigh-johnson/JobDetailService 
Add JobDetailService, remove REST calls from JobDetail controller
 2016-03-15 11:39:07 -04:00
Leigh Johnson
af9882af97 Yoink REST calls from Job Details controller into modular service, resolves #1239 2016-03-14 21:16:44 -04:00
Matthew Jones
7e818319b5 Pass, don't return pass when checking mongo connectivity 2016-03-14 13:53:34 -04:00
Matthew Jones
001eb1f69f Handle a mongo OperationFailure 
This seems to happenw hen the database is up, allows us to connect but
we don't have permission to access the objects (or they don't exist
yet).
 2016-03-14 11:57:34 -04:00
Ken Hoes
b43f7e8c7f Lookup modal not-resizable 2016-03-14 11:42:44 -04:00
Ken Hoes
5fdab74ae7 Increase specificity and keep y-scrollbar for long name edge cases. 2016-03-14 11:36:29 -04:00
kensible
f6f4238445 Merge pull request #1235 from ansible/revert-1234-1231-lookupModal-specs 
Revert "Lookup modal feedback from demo prep"
 2016-03-14 10:30:19 -04:00
kensible
36182109e2 Revert "Lookup modal feedback from demo prep" 2016-03-14 10:27:25 -04:00
kensible
275bd553d0 Merge pull request #1234 from kensible/1231-lookupModal-specs 
Lookup modal feedback from demo prep
 2016-03-14 10:10:19 -04:00
Ken Hoes
9387725442 Lookup modal feedback from demo prep 2016-03-14 09:26:43 -04:00
AlanCoding
6996ea22b0 style tweaks, add one more assertion 2016-03-13 22:39:52 -04:00
AlanCoding
39c9563352 test and fix for POST to empty list scenaro and JT count fix 2016-03-13 20:40:21 -04:00
AlanCoding
9f25a48936 fix for POST scenario 2016-03-13 11:45:08 -04:00
AlanCoding
765dcd3318 Added queries that calculate counts for organization resources 2016-03-12 22:02:03 -05:00
Leigh
a1c843e9f6 Merge pull request #1226 from leigh-johnson/CopyJobTemplate2 
v2, Directly edit a copied Job Template, refactor delete-job-template-service-test
 2016-03-11 18:51:52 -05:00
Leigh Johnson
ff1c41e8dc revert unintended change to awx-munin.conf 2016-03-11 15:33:16 -05:00
Matthew Jones
eab223d229 Make sure we are covering system jobs and template on notifications 2016-03-11 15:11:08 -05:00
Leigh Johnson
e34aebcd93 refactor delete-job-template.service-test, integrate jobTemplate.copy, resolves #1105 & #1047, tracking #1176 2016-03-11 14:41:05 -05:00
Matthew Jones
cdc342a6ee Fix fact database migration 
For new installs the database may not be online and thus the migration
can't happen.  This will allow it to continue but we may want more
messaging to the user running potential upgrades
 2016-03-11 12:59:21 -05:00