use FEATURES and debug

lms/envs/devstack_docker.py

@@ -20,7 +20,6 @@ ECOMMERCE_API_URL = 'http://edx.devstack.ecommerce:18130/api/v2'
 COMMENTS_SERVICE_URL = 'http://edx.devstack.forum:4567'
 
 ENTERPRISE_API_URL = '{}/enterprise/api/v1/'.format(LMS_ROOT_URL)
-ENABLE_ENTERPRISE_INTEGRATION = True 
 
 CREDENTIALS_INTERNAL_SERVICE_URL = 'http://edx.devstack.credentials:18150'
 CREDENTIALS_PUBLIC_SERVICE_URL = 'http://localhost:18150'
@@ -40,7 +39,7 @@ FEATURES.update({
     'ENABLE_DASHBOARD_SEARCH': False,
     'ENABLE_DISCUSSION_SERVICE': True,
     'SHOW_HEADER_LANGUAGE_SELECTOR': True,
-    'ENABLE_ENTERPRISE_INTEGRATION': False,
+    'ENABLE_ENTERPRISE_INTEGRATION': True,
 })
 
 ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', False)

openedx/features/enterprise_support/api.py

@@ -322,13 +322,9 @@ def enterprise_enabled():
     """
     Determines whether the Enterprise app is installed
     """
-<<<<<<< HEAD
-    return 'enterprise' in settings.INSTALLED_APPS and settings.FEATURES.get('ENABLE_ENTERPRISE_INTEGRATION', False)
-=======
-    is_enabled = 'enterprise' in settings.INSTALLED_APPS and getattr(settings, 'ENABLE_ENTERPRISE_INTEGRATION', True)
+    is_enabled = 'enterprise' in settings.INSTALLED_APPS and settings.FEATURES.get('ENABLE_ENTERPRISE_INTEGRATION', False)
     LOGGER.warning("BF!! enterprise enabled=%s", is_enabled)
-    return 'enterprise' in settings.INSTALLED_APPS and getattr(settings, 'ENABLE_ENTERPRISE_INTEGRATION', True)
->>>>>>> add debugger and enterprise integration
+    return is_enabled
 
 
 def enterprise_customer_uuid_for_request(request):