Adds configuration for the network-ui websocket

* Configures NGINX for the network-ui websocket.
* Configures supervisor.conf for network_ui websocket.

awx/network_ui/static/network_ui/Makefile

@@ -21,5 +21,5 @@ istanbul:
 	istanbul instrument --output src-instrumented src
 	webpack src-instrumented/main.js  js/bundle-instrumented.js
 	cp index.html index-instrumented.html
-	sed -i "" "s/bundle.js/bundle-instrumented.js/g" index-instrumented.html
+	sed -i "s/bundle.js/bundle-instrumented.js/g" index-instrumented.html
 	cp vendor/*.js js/

requirements/requirements.txt

@@ -106,6 +106,9 @@ constantly==15.1.0        # via twisted
 cryptography==2.1.4       # via adal, azure-cosmosdb-table, azure-storage-common, pyopenssl, requests, secretstorage
 daphne==1.3.0
 decorator==4.2.1
+dpath==1.4.0
+debtcollector==1.15.0     # via oslo.config, oslo.utils, python-designateclient, python-keystoneclient, python-neutronclient
+decorator==4.0.11         # via shade
 defusedxml==0.4.1         # via python-saml
 deprecation==2.0          # via openstacksdk
 django-auth-ldap==1.2.8

tools/docker-compose.yml

@@ -36,6 +36,8 @@ services:
   # Postgres Database Container
   postgres:
     image: postgres:9.6
+    ports:
+        - "5432:5432"
   memcached:
     image: memcached:alpine
     ports:

tools/docker-compose/nginx.vh.default.conf

@@ -30,7 +30,7 @@ server {
         sendfile off;
     }
 
-    location /websocket {
+    location ~ ^/(websocket|network_ui) {
         # Pass request to the upstream alias
         proxy_pass http://daphne;
         # Require http version 1.1 to allow for upgrade requests
@@ -90,7 +90,7 @@ server {
         sendfile off;
     }
 
-    location /websocket {
+    location ~ ^/(websocket|network_ui) {
         # Pass request to the upstream alias
         proxy_pass http://daphne;
         # Require http version 1.1 to allow for upgrade requests

tools/docker-compose/supervisor.conf

@@ -20,7 +20,7 @@ stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 
 [program:runworker]
-command = python manage.py runworker --only-channels websocket.*
+command = python manage.py runworker
 autostart = true
 autorestart = true
 redirect_stderr=true