Merge pull request ansible#774 from matburt/jupyter_for_devel

Adding jupyter notebook support to the AWX development environment
aladjadj · Dec 6, 2017 · 7fc896e · 7fc896e
2 parents 9488105 + da0b686
commit 7fc896e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -334,18 +334,18 @@ receiver:
 	fi; \
 	$(PYTHON) manage.py run_callback_receiver
 
-socketservice:
-	@if [ "$(VENV_BASE)" ]; then \
-		. $(VENV_BASE)/awx/bin/activate; \
-	fi; \
-	$(PYTHON) manage.py run_socketio_service
-
 nginx:
 	nginx -g "daemon off;"
 
 rdb:
 	$(PYTHON) tools/rdb.py
 
+jupyter:
+	@if [ "$(VENV_BASE)" ]; then \
+		. $(VENV_BASE)/awx/bin/activate; \
+	fi; \
+	$(MANAGEMENT_COMMAND) shell_plus --notebook
+
 reports:
 	mkdir -p $@
 

diff --git a/awx/settings/development.py b/awx/settings/development.py
@@ -19,6 +19,18 @@
 # Load default settings.
 from defaults import *  # NOQA
 
+# awx-manage shell_plus --notebook
+NOTEBOOK_ARGUMENTS = [
+    '--NotebookApp.token=',
+    '--ip', '0.0.0.0',
+    '--port', '8888',
+    '--allow-root',
+    '--no-browser',
+]
+
+# print SQL queries in shell_plus
+SHELL_PLUS_PRINT_SQL = False
+
 # show colored logs in the dev environment
 # to disable this, set `COLOR_LOGS = False` in awx/settings/local_settings.py
 LOGGING['handlers']['console']['()'] = 'awx.main.utils.handlers.ColorHandler'

diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt
@@ -13,3 +13,5 @@ pytest-mock
 logutils
 flower
 uwsgitop
+jupyter
+matplotlib
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       CELERY_RDB_HOST: 0.0.0.0
       AWX_GROUP_QUEUES: tower
     ports:
+      - "8888:8888"
       - "8080:8080"
       - "5555:5555"
       - "8013:8013"

diff --git a/tools/docker-compose/Procfile b/tools/docker-compose/Procfile
@@ -5,3 +5,4 @@ celeryd:        make celeryd
 receiver:       make receiver
 flower:         make flower
 uwsgi:          make uwsgi
+jupyter:        make jupyter
diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf
@@ -59,6 +59,14 @@ redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
+[program:jupyter]
+command = make jupyter
+autostart = true
+autorestart = true
+redirect_stderr=true
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+
 [group:awx-processes]
 programs=celeryd,receiver,runworker,uwsgi,daphne,nginx,flower
 priority=5