External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-19 20:20:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix system jobs not starting due to task manager and cred changes

Browse Source 
* 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
This commit is contained in:
Matthew Jones
2017-05-18 13:10:48 -04:00
parent 7c2e5df659
commit cf7fb8ddd7
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/jobs.py
View File

@@ -1344,6 +1344,10 @@ class SystemJob(UnifiedJob, SystemJobOptions, JobNotificationMixin):
def task_impact(self): def task_impact(self):
return 150 return 150
@property
def preferred_instance_groups(self):
return self.global_instance_groups
''' '''
JobNotificationMixin JobNotificationMixin
''' '''

4
awx/main/tasks.py
View File

@@ -737,8 +737,10 @@ class BaseTask(Task):
# handle custom injectors specified on the CredentialType # handle custom injectors specified on the CredentialType
if hasattr(instance, 'all_credentials'): if hasattr(instance, 'all_credentials'):
credentials = instance.all_credentials credentials = instance.all_credentials
else: elif hasattr(instance, 'credential'):
credentials = [instance.credential] credentials = [instance.credential]
else:
credentials = []
for credential in credentials: for credential in credentials:
if credential: if credential:
credential.credential_type.inject_credential( credential.credential_type.inject_credential(

2
tools/docker-compose/start_development.sh
View File

@@ -25,7 +25,7 @@ fi
cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true 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 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 yes | cp -rf /tower_devel/tools/docker-compose/supervisor.conf /supervisor.conf
# Tower bootstrapping # Tower bootstrapping