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

340 Commits

Author SHA1 Message Date
Matthew Jones
1a4a6273a4 Merge branch 'rampart_groups_setup_playbook' into devel
* rampart_groups_setup_playbook:
  Updating changelog for Instance Groups
  Fix an incorrect reference on instance group jobs list
  Purge remaining references to rampart groups
  Simplify can_access for instance groups on job templates
  Adding Instance Group permissions and tests
  Increase test coverage for task scheduler inventory updates
  Exit logic fixes for instance group tools
  View Fixes for instance groups
  new view to allow associations but no creations
  Updating acceptance documentation and system docs
  Updating unit tests for task manager refactoring
  Update views and serializers to support instance group (ramparts)
  Implementing models for instance groups, updating task manager
  Updating the setup playbook to support instance group installation
  Add nginx to server start and switch back to first tmux win
  Fix an issue where the local queue wouldn't use the rabbitmq name
2017-05-12 13:40:30 -04:00
Matthew Jones
705f8af440 Update views and serializers to support instance group (ramparts)
* includes top level views for instances and instance groups and
  extending those views to be able to view running jobs
* Associative endpoints on Organizations, Inventories, and Job
  Templates
* Related and summary field entries where appropriate
* Adding job model references to executing instance group
* Fix up default queue properties for clustering from the settings file
* Update production and default settings for instance queues in settings
2017-05-10 12:33:03 -04:00
Matthew Jones
4ced911c00 Implementing models for instance groups, updating task manager
* New InstanceGroup model and associative relationship with Instances
* Associative instances between Organizations, Inventory, and Job
  Templates and InstanceGroups
* Migrations for adding fields and tables for Instance Groups
* Adding activity stream reference for instance groups
* Task Manager Refactoring:
** Simplifying task manager relationships and move away from the
   interstitial hash tables
** Simplify dependency determination logic
** Reduce task manager runtime complexity by removing the partial
   references and moving the logic into the task manager directly or
   relying on Job model logic for determinism
2017-05-10 12:32:54 -04:00
Ryan Petrello
3126bfa1a2 add tooling to aid in remote debugging sessions 2017-05-09 15:36:13 -04:00
Aaron Tan
8d2ee8c30f Refactor log handler and support TCP/UDP communications 2017-04-25 11:07:57 -04:00
Ryan Petrello
ba259e0ad4 Introduce a new CredentialTemplate model
Credentials now have a required CredentialType, which defines inputs
(i.e., username, password) and injectors (i.e., assign the username to
SOME_ENV_VARIABLE at job runtime)

This commit only implements the model changes necessary to support the
new inputs model, and includes code for the credential serializer that
allows backwards-compatible support for /api/v1/credentials/; tasks.py
still needs to be updated to actually respect CredentialType injectors.

This change *will* break the UI for credentials (because it needs to be
updated to use the new v2 endpoint).

see: #5877
see: #5876
see: #5805
2017-04-21 15:42:26 -04:00
AlanCoding
933bc81dc2 Add bzip2 to Dockerfile yum install line 2017-04-10 08:11:06 -04:00
AlanCoding
5078ed077a install bzip2 so makefile targets to build frontend work 2017-04-07 11:24:17 -04:00
Shane McDonald
93dda555f1 Get offline pip installs working
I had to pull the git urls out of the main requirements files because in order to install offline (--no-index), we need pip to install from local package archives rather than cloning repo.

The weird `cat` thing going on in the Makefile is because we need to install everything as part of a single `pip install` transaction. Without this, installing only requirements_git.txt will result in dependencies getting unintentionally updated.
2017-03-29 14:30:58 -04:00
Shane McDonald
0e2a2d61e2 Create a setup subpackage 2017-03-23 16:46:25 -04:00
Matthew Jones
eb2e7c38b0 Bring up logstash as part of the development cluster 2017-03-21 10:42:32 -04:00
Ryan Petrello
75ba0208ad output logs to /logstash.conf in our default compose file 2017-03-16 13:20:33 -04:00
Shane McDonald
8a8901afe4 Default image tag for unit test container image. 2017-03-10 11:53:37 -05:00
Shane McDonald
0970726fa6 Don't pre-build UI deps for unit tests
I know, this sucks. I spent all day trying to get to the bottom of the CI failures that started happening the other day with no luck.

There is something going on with how we were moving the node_modules directory into the source tree from the pre-built location in /tmp. This was working, but then it broke. I hope to cycle back on this sometime next week if I have the time.
2017-03-09 18:54:24 -05:00
Shane McDonald
afb5658376 Remove npm hacks from unit-test-runner
This hasnt been necessary for a while, just forgot it was here..
2017-03-08 15:18:52 -05:00
Shane McDonald
c25795d3fc Rebuild unit-test image for every branch
This variable is set by Jenkins, you'll have to set it manually if you build locally.
2017-03-08 15:18:21 -05:00
Matthew Jones
576e3bfc1a Adding logstash to default compose file 2017-03-07 16:48:51 -05:00
Wayne Witzel III
50f187b78c run clustered as privleged to avoid namespace error 2017-02-24 11:12:39 -05:00
AlanCoding
0bd606e26f remove unnecessary imports after context manager change 2017-02-21 12:08:03 -05:00
AlanCoding
9e363d82d8 disable activity stream in cleanup_jobs and test context managers 2017-02-16 14:09:48 -05:00
Shane McDonald
b7317cbdc1 Merge pull request #5114 from sundeep-co-in/release_3.1.0
add lang option in push/pull
2017-02-14 12:29:33 -05:00
AlanCoding
9a88091042 get supervisorctl to work in dev supervisor env 2017-02-13 17:36:35 -05:00
AlanCoding
b5aad8cbed bypass the makefile target for most commands in dev supervisor 2017-02-13 17:36:35 -05:00
AlanCoding
d1a71fb7be add supervisor option to development environment 2017-02-13 17:36:34 -05:00
Alan Rominger
8c1be80215 Merge pull request #5277 from AlanCoding/various_logging_updates
Update logging docs & switch out null logger
2017-02-09 15:56:09 -05:00
AlanCoding
279546e110 make obvious updates to the logging related docs 2017-02-09 12:37:57 -05:00
Ryan Petrello
4932310ad1 map docker container ports to allow access easier to memcache
this eases memcached interaction from your host, e.g.,
$ echo "get :1:LICENSE" | nc localhost 11211
2017-02-09 11:00:06 -05:00
Ryan Petrello
f4d55659f0 enforce a sane default OPT_NETWORK_TIMEOUT for LDAP connections
see: #5208
2017-02-07 12:37:05 -05:00
Bill Nottingham
c2d39af953 Merge pull request #5177 from wenottingham/blah
Fixup request_tower_configuration.sh
2017-02-06 10:08:46 -05:00
Bill Nottingham
e651027294 Fixup request_tower_configuration.sh
Drop retry-related commandline argument, since we don't use that any more.

Ensure -e is allowed.
2017-02-03 13:34:42 -05:00
Alan Rominger
b822ef14c4 Merge pull request #5105 from AlanCoding/data_gen_to_the_moon
Make data generator work for larger data sets
2017-02-03 12:34:56 -05:00
Matthew Jones
d469ef2385 Add in localization setup to the container image
This should fix up utf8 question marks
2017-02-02 15:51:50 -05:00
sundeep-co-in
5af2f51bd9 add lang option in push/pull 2017-02-01 22:04:08 +05:30
AlanCoding
efa676f3e7 tweaks to make data generator not fail on super large job event data sets
refine formatting of job event print statement
update presets.tsv file
2017-02-01 08:32:52 -05:00
Shane McDonald
ece5299a74 Add gcc-c++ to development container 2017-01-31 13:09:59 -05:00
Ryan Petrello
51b50ce735 map docker container ports to allow usage of celery.contrib.rdb
http://docs.celeryproject.org/en/latest/reference/celery.contrib.rdb.html
allows you to remotely debug running celery tasks with:

    from celery.contrib import rdb
    rdb.set_trace()

this will bind a remote Python debugger on a random TCP port between
6899-6999, which you can telnet into for remote task debugging
2017-01-31 09:13:07 -05:00
Ryan Petrello
73cbcc2de0 add awx.conf tests to our various test run environments 2017-01-30 12:37:17 -05:00
AlanCoding
eaffde438b encode logic for JT name-uniqueness in data generator 2017-01-26 09:00:10 -05:00
AlanCoding
c22cf2f7e6 more presets and timing functionality to data generator 2017-01-25 09:51:25 -05:00
AlanCoding
f265d2fe0f tighten up code for new UJ queryset 2017-01-25 09:51:24 -05:00
AlanCoding
36c68178dd cleanup from accessible_objects refactor 2017-01-25 09:51:24 -05:00
AlanCoding
b2d0871a5e Refactor of accessible_objects for polymorphic model
query simplification, with break-out into an intermediary
state that can be used in access methods
2017-01-25 09:51:24 -05:00
Matthew Jones
8e2342b7c2 Merge pull request #4881 from matburt/nginx_alt_port
Implement alternate ports for nginx
2017-01-23 16:16:51 -05:00
Shane McDonald
1cac3abc9f Whitespace fix in translation 2017-01-23 14:50:35 -05:00
Matthew Jones
8a9b2fcaea Implement alternate ports for nginx
* This also allows disabling https mode in the nginx configuration
* Reconfigure the development container to not specifically require
  https, so the haproxy cluster configuration can work
2017-01-23 14:34:15 -05:00
Shane McDonald
b60b4b2bc1 Generate .mo files without django, enable API l10n at build time. 2017-01-23 12:25:56 -05:00
sundeep-co-in
03c774e968 update zanata config 2017-01-20 18:10:43 +05:30
Alan Rominger
5f65464a0e Merge pull request #4805 from AlanCoding/bulk_data_bug
Fix bulk data creator bugs for jobs and job events
2017-01-18 16:38:57 -05:00
AlanCoding
13bcf4b090 fix bulk data creator bugs for jobs and job events 2017-01-18 16:32:33 -05:00
Matthew Jones
6ed86e1934 Revert "bump pkg info tower version to 3.1.0"
This reverts commit dea4c873e8d89f3e2ed5e74f8d3eb480e57f927d.
2017-01-18 14:30:06 -05:00
Bill Nottingham
d0067109c1 Merge pull request #4547 from wenottingham/sending-out-an-sos
Update sosreport config.
2017-01-13 14:59:57 -05:00
Matthew Jones
9f777f6153 Add some provisions for https into haproxy and the cluster 2017-01-03 13:59:29 -05:00
AlanCoding
67686f640b finish implementation of data generator presets, fix flake8 2017-01-03 09:23:27 -05:00
AlanCoding
8c05d7e968 clean up boilerplate for reading preset data 2017-01-03 08:53:45 -05:00
AlanCoding
ccf9fe4ecb last job, more cleanup, and start work on preset data sets 2016-12-26 22:40:32 -05:00
AlanCoding
8f3041d8b4 add creation of labels 2016-12-25 19:42:56 -05:00
AlanCoding
bdfa29b778 apply created_by and other defaults to all 2016-12-25 18:45:58 -05:00
AlanCoding
9d8b1b4a12 add WFJT node networks 2016-12-24 23:17:09 -05:00
AlanCoding
be97f2ca74 generators plus WFJT nodes added to data generator 2016-12-22 14:37:02 -05:00
Bill Nottingham
8160539865 Update sosreport config.
Run pip freeze from venvs, include nginx & rabbit logs, drop apache & redis logs.
2016-12-22 14:24:15 -05:00
AlanCoding
c3aaccc0d4 make it so that repeated runs do not cause problems 2016-12-22 13:53:19 -05:00
AlanCoding
1346f7b580 fixing some of most annoying problems with bulk data generator 2016-12-22 12:03:56 -05:00
Chris Meyers
12397ce610 bump pkg info tower version to 3.1.0 2016-12-20 14:42:00 -05:00
James Laska
7bb2021337 Fixed typo in -h output 2016-12-19 11:58:28 -05:00
James Laska
e27c117256 Rewrite request_tower_configuration.sh
Adds proper getopts support and usage. Remove the retry logic, since it
would *never* retry given existing conditional checks.

Connect #3923
2016-12-19 11:46:40 -05:00
Chris Meyers
d550f6153a more jenkins removal fixes 2016-12-16 14:43:20 -05:00
Chris Meyers
304fcbe945 requirements jenkins is no longer a thing 2016-12-16 14:29:57 -05:00
Matthew Jones
a25853a3a5 Updating translation artifacts
* also installing translation tools into dev environment
* Removing fedora install instructions, no one here uses fedora
2016-12-14 15:58:47 -05:00
Wayne Witzel III
2069473534 allow API requests from localhost/127.0.0.1 to be insecure 2016-12-13 11:47:13 -05:00
Wayne Witzel III
19f7d9e8d8 redirect if no forward-slash 2016-12-12 13:25:10 -05:00
Wayne Witzel III
c6e1598b9c explicitly set long harakiri time to deal with very large inventory deletes 2016-12-12 12:44:05 -05:00
Wayne Witzel III
5f5624c5a3 Update to use Modern values for SSL 2016-12-12 12:42:53 -05:00
Wayne Witzel III
4c8af2a4b8 update uwsgi/nginx dev configuration 2016-12-12 12:42:20 -05:00
John Mitchell
d62bad536b add mkdir command to start_development script to cause collectstatic not to error 2016-12-06 12:22:18 -05:00
Matthew Jones
408c79a845 Merge pull request #4219 from sundeep-co-in/STAGE
add django.pot
2016-12-04 21:04:41 -05:00
sundeep-co-in
cd5301bf49 add django.pot 2016-12-02 14:02:13 +05:30
AlanCoding
f3805b1317 enable Logstash auth and prepare for handler for multiple auth types 2016-11-29 14:05:19 -05:00
AlanCoding
f3427d1359 Logging Integration, ELK docker-compose as update file 2016-11-29 13:09:47 -05:00
Aaron Tan
9e4655419e Fix flake8 E302 errors. 2016-11-15 20:59:39 -05:00
Aaron Tan
473ed016de Fix flake8 E305 errors. 2016-11-15 16:32:27 -05:00
AlanCoding
8f3e3c4ae1 change ordering of test dirs 2016-11-14 17:50:10 -05:00
Shane McDonald
30e5904ab3 Use tower_devel as base image for unit tests 2016-11-11 15:47:17 -05:00
Shane McDonald
6f39995060 Fix docker-compose error
Fixes this error:

```
ERROR: yaml.parser.ParserError: while parsing a block mapping
  in "./tools/docker-compose/unit-tests/docker-compose.yml", line 10, column 7
expected <block end>, but found '<scalar>'
  in "./tools/docker-compose/unit-tests/docker-compose.yml", line 11, column 40
```
2016-11-10 13:38:15 -05:00
Shane McDonald
cc359ecbad Default TEST_DIRS in docker-compose 2016-11-10 13:12:29 -05:00
James Laska
90fff3da29 Add fontconfig testjs dependency
Also cleaned up some whitespace for consistency.
2016-11-08 10:18:53 -05:00
Matthew Jones
88a8810815 Merge pull request #3729 from sundeep-co-in/STAGE
enable django i18n
2016-11-04 15:52:33 -04:00
Matthew Jones
b0e40b6c29 Remove proot from dev base image in favor of bubblewrap
Remove python utils from base system, they are included with the venvs
2016-11-03 16:06:03 -04:00
Matthew Jones
e01c86e88f Fix missing import for failure signal handler 2016-11-03 09:43:18 -04:00
Shane McDonald
793ce37a07 Get unit-test container working
node_modules was being overwritten by the bind-mount when the container started. This is kind of hacky, but it’s the only way to do this without changing everything.
2016-11-02 19:30:37 -04:00
Matthew Jones
4cb2e5aa02 Add failure event handler for supervisor process 2016-11-02 13:44:01 -04:00
Shane McDonald
4e81daafec Hack for downgrading npm when using overlay storage driver
https://github.com/npm/npm/issues/9863
2016-11-02 12:22:10 -04:00
Shane McDonald
021666482a Downgrade npm in unit-test image
https://github.com/npm/npm/issues/14042#issuecomment-249139529
2016-11-02 12:08:03 -04:00
sundeep-co-in
4237b2e207 resolve conflict: index.html 2016-10-31 23:40:56 +05:30
Matthew Jones
defd271c90 Make sure we bootstrap the static dir prior to starting 2016-10-28 14:21:19 -04:00
sundeep-co-in
d65e121b19 flake8 compliance 2016-10-28 14:07:08 +05:30
sundeep-co-in
2ddcffc184 zanata config loc 2016-10-27 22:26:39 +05:30
sundeep-co-in
c1a5fb3312 resolve conflict 2016-10-27 08:13:02 +05:30
sundeep-co-in
be93cb488c django-i18n: small fix 2016-10-26 23:31:12 +05:30
sundeep-co-in
3bf72f1dba add manage_translations 2016-10-26 16:47:49 +05:30
Graham Mainwaring
a59b226a68 Merge pull request #3764 from ghjm/packaging_3.1
RPM and setup playbook fixes for 3.1
2016-10-24 15:57:46 -04:00