External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1355 from ryanpetrello/devel

Browse Source 
set $HOME via an API call so AWX_TASK_ENV isn't marked as readonly
This commit is contained in:
Ryan Petrello
2018-02-27 09:57:17 -05:00
committed by GitHub
parent c3968ca2b6 7741de5153
commit 3636a7c582
4 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/image_build/files/launch_awx_task.sh
View File

@@ -18,6 +18,7 @@ else
echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'root@localhost', 'password')" | awx-manage shell echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'root@localhost', 'password')" | awx-manage shell
awx-manage create_preload_data awx-manage create_preload_data
fi fi
echo 'from django.conf import settings; x = settings.AWX_TASK_ENV; x["HOME"] = "/var/lib/awx"; settings.AWX_TASK_ENV = x' | awx-manage shell
awx-manage provision_instance --hostname=$(hostname) awx-manage provision_instance --hostname=$(hostname)
awx-manage register_queue --queuename=tower --instance_percent=100 awx-manage register_queue --queuename=tower --instance_percent=100
supervisord -c /supervisor_task.conf supervisord -c /supervisor_task.conf

2
installer/image_build/files/settings.py
View File

@@ -23,8 +23,6 @@ ALLOWED_HOSTS = ['*']
INTERNAL_API_URL = 'http://awxweb:8052' INTERNAL_API_URL = 'http://awxweb:8052'
AWX_TASK_ENV['HOME'] = '/var/lib/awx'
# Container environments don't like chroots # Container environments don't like chroots
AWX_PROOT_ENABLED = False AWX_PROOT_ENABLED = False

1
installer/kubernetes/templates/configmap.yml.j2
View File

@@ -30,7 +30,6 @@ data:
SECRET_KEY = file('/etc/tower/SECRET_KEY', 'rb').read().strip() SECRET_KEY = file('/etc/tower/SECRET_KEY', 'rb').read().strip()
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
INTERNAL_API_URL = 'http://127.0.0.1:8052' INTERNAL_API_URL = 'http://127.0.0.1:8052'
AWX_TASK_ENV['HOME'] = '/var/lib/awx'
SERVER_EMAIL = 'root@localhost' SERVER_EMAIL = 'root@localhost'
DEFAULT_FROM_EMAIL = 'webmaster@localhost' DEFAULT_FROM_EMAIL = 'webmaster@localhost'
EMAIL_SUBJECT_PREFIX = '[AWX] ' EMAIL_SUBJECT_PREFIX = '[AWX] '

1
installer/openshift/templates/configmap.yml.j2
View File

@@ -31,7 +31,6 @@ data:
SECRET_KEY = file('/etc/tower/SECRET_KEY', 'rb').read().strip() SECRET_KEY = file('/etc/tower/SECRET_KEY', 'rb').read().strip()
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
INTERNAL_API_URL = 'http://127.0.0.1:8052' INTERNAL_API_URL = 'http://127.0.0.1:8052'
AWX_TASK_ENV['HOME'] = '/var/lib/awx'
SERVER_EMAIL = 'root@localhost' SERVER_EMAIL = 'root@localhost'
DEFAULT_FROM_EMAIL = 'webmaster@localhost' DEFAULT_FROM_EMAIL = 'webmaster@localhost'
EMAIL_SUBJECT_PREFIX = '[AWX] ' EMAIL_SUBJECT_PREFIX = '[AWX] '