diff options
| author | Matthew Jones <matburt@redhat.com> | 2017-05-18 19:10:48 +0200 |
|---|---|---|
| committer | Matthew Jones <matburt@redhat.com> | 2017-05-18 19:10:48 +0200 |
| commit | cf7fb8ddd716e54c68eaded47faa8d5cb50e90ff (patch) | |
| tree | 396115cbe3469f152bd7126373de812b01e9478b /tools/docker-compose | |
| parent | Merge pull request #6282 from wwitzel3/smart-inventory (diff) | |
| download | awx-cf7fb8ddd716e54c68eaded47faa8d5cb50e90ff.tar.xz awx-cf7fb8ddd716e54c68eaded47faa8d5cb50e90ff.zip | |
Fix system jobs not starting due to task manager and cred changes
* Task Manager logic wasn't assigning default instance group on system
jobs
* Task credential changes assumed the model would have a credential
* Fix up an innocuous error symlinking rdb.py if it already exists
Diffstat (limited to 'tools/docker-compose')
| -rwxr-xr-x | tools/docker-compose/start_development.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh index 56a5c968a1..966f11c9ba 100755 --- a/tools/docker-compose/start_development.sh +++ b/tools/docker-compose/start_development.sh @@ -25,7 +25,7 @@ fi cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true cp /tmp/ansible-tower.egg-link /venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link -ln -s /tower_devel/tools/rdb.py /venv/tower/lib/python2.7/site-packages/rdb.py +ln -s /tower_devel/tools/rdb.py /venv/tower/lib/python2.7/site-packages/rdb.py || true yes | cp -rf /tower_devel/tools/docker-compose/supervisor.conf /supervisor.conf # Tower bootstrapping |