Update settings references

* PROOT
* Pendo tracking state
* ad hoc commands
* activity stream
* org admin visibility
This commit is contained in:
Matthew Jones
2015-12-15 16:44:08 -05:00
parent a4d4e6d0fb
commit 35b19bf220
8 changed files with 22 additions and 17 deletions

View File

@@ -28,6 +28,7 @@ from awx.main.models import * # noqa
from awx.main.utils import ignore_inventory_computed_fields, check_proot_installed, wrap_args_with_proot
from awx.main.signals import disable_activity_stream
from awx.main.task_engine import TaskSerializer as LicenseReader
from awx.main.conf import tower_settings
logger = logging.getLogger('awx.main.commands.inventory_import')
@@ -356,7 +357,7 @@ class ExecutableJsonLoader(BaseLoader):
data = {}
stdout, stderr = '', ''
try:
if self.is_custom and getattr(settings, 'AWX_PROOT_ENABLED', False):
if self.is_custom and getattr(tower_settings, 'AWX_PROOT_ENABLED', False):
if not check_proot_installed():
raise RuntimeError("proot is not installed but is configured for use")
kwargs = {'proot_temp_dir': self.source_dir} # TODO: Remove proot dir