diff options
| author | Matthew Jones <matburt@redhat.com> | 2017-05-12 19:40:30 +0200 |
|---|---|---|
| committer | Matthew Jones <matburt@redhat.com> | 2017-05-12 19:40:30 +0200 |
| commit | 1a4a6273a4c770cdefa4eff257d4348fd8390851 (patch) | |
| tree | 0e69349dac4968c2be3eec7bed3f32469807e979 /tools | |
| parent | Merge pull request #6253 from marshmalien/truncateRevisionHash (diff) | |
| parent | Updating changelog for Instance Groups (diff) | |
| download | awx-1a4a6273a4c770cdefa4eff257d4348fd8390851.tar.xz awx-1a4a6273a4c770cdefa4eff257d4348fd8390851.zip | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose.yml | 2 | ||||
| -rw-r--r-- | tools/docker-compose/supervisor.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index 26b851db21..d0b5416abc 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -35,7 +35,7 @@ services: dockerfile: Dockerfile-logstash # Postgres Database Container postgres: - image: postgres:9.4.1 + image: postgres:9.6 memcached: image: memcached:alpine ports: diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf index aab7d8aeb7..b46d05bf4c 100644 --- a/tools/docker-compose/supervisor.conf +++ b/tools/docker-compose/supervisor.conf @@ -4,7 +4,7 @@ minfds = 4096 nodaemon=true [program:celeryd] -command = python manage.py celeryd -l DEBUG -B --autoreload --autoscale=20,3 --schedule=/celerybeat-schedule -Q projects,jobs,default,scheduler,broadcast_all,%(ENV_HOSTNAME)s -n celery@%(ENV_HOSTNAME)s +command = python manage.py celeryd -l DEBUG -B --autoreload --autoscale=20,3 --schedule=/celerybeat-schedule -Q tower_scheduler,tower_broadcast_all,tower,%(ENV_HOSTNAME)s -n celery@%(ENV_HOSTNAME)s autostart = true autorestart = true redirect_stderr=true |