add debugger and enterprise integration

lms/envs/devstack_docker.py

@@ -20,6 +20,7 @@ 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'

manage.py

@@ -112,5 +112,9 @@ if __name__ == "__main__":
     startup.run()
 
     from django.core.management import execute_from_command_line
-
+    import ptvsd
+    try:
+        ptvsd.enable_attach("my_secret", address = ('0.0.0.0', 21000))
+    except:
+        pass
     execute_from_command_line([sys.argv[0]] + django_args)

openedx/features/enterprise_support/api.py

@@ -322,7 +322,13 @@ 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)
+    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
 
 
 def enterprise_customer_uuid_for_request(request):