Minor tweaks

nodeodm/migrations/0008_rename_default_odm_node.py

@@ -7,7 +7,7 @@ from nodeodm.models import ProcessingNode
 def rename_default_node(apps, schema_editor):
     for default_node in ProcessingNode.objects.filter(hostname='node-odm-1'):
         default_node.hostname = 'webodm_node-odm_1'
-        default_node.defaults = {'hostname': 'webodm_node-odm_1', 'port': 3000}
+        default_node.label = 'node-odm-1'
         default_node.save()
     
 class Migration(migrations.Migration):

start.sh

@@ -58,7 +58,7 @@ echo Running migrations
 python manage.py migrate
 
 if [[ "$WO_DEFAULT_NODES" > 0 ]]; then
-   echo -e "from nodeodm.models import ProcessingNode\nfor node_index in map(str, range(1, $WO_DEFAULT_NODES + 1)):\n\t ProcessingNode.objects.update_or_create(hostname='webodm_node-odm_' + node_index, defaults={'hostname': 'webodm_node-odm_' + node_index, 'port': 3000})" | python manage.py shell
+   echo -e "from nodeodm.models import ProcessingNode\nfor node_index in map(str, range(1, $WO_DEFAULT_NODES + 1)):\n\t ProcessingNode.objects.update_or_create(hostname='webodm_node-odm_' + node_index, defaults={'hostname': 'webodm_node-odm_' + node_index, 'port': 3000, 'label': 'node-odm-' + node_index})" | python manage.py shell
 fi
 
 if [[ "$WO_CREATE_MICMAC_PNODE" = "YES" ]]; then

webodm.sh

@@ -88,6 +88,7 @@ case $key in
     ;;
     --no-default-node)
     default_nodes=0
+    echo "ATTENTION: --no-default-node is deprecated. Use --default-nodes instead."
     export WO_DEFAULT_NODES=0
     shift # past argument
     ;;
@@ -132,7 +133,6 @@ usage(){
   echo "	--port	<port>	Set the port that WebODM should bind to (default: $DEFAULT_PORT)"
   echo "	--hostname	<hostname>	Set the hostname that WebODM will be accessible from (default: $DEFAULT_HOST)"
   echo "	--media-dir	<path>	Path where processing results will be stored to (default: $DEFAULT_MEDIA_DIR (docker named volume))"
-  echo "	--no-default-node	Do not create a default NodeODM node attached to WebODM on startup (default: disabled). DEPRECATED: please use the argument 'default-nodes'"
   echo "	--default-nodes	The amount of default NodeODM nodes attached to WebODM on startup (default: 1)"
   echo "	--with-micmac	Create a NodeMICMAC node attached to WebODM on startup. Experimental! (default: disabled)"
   echo "	--ssl	Enable SSL and automatically request and install a certificate from letsencrypt.org. (default: $DEFAULT_SSL)"
@@ -201,6 +201,7 @@ start(){
 	echo "SSL certificate: $WO_SSL_CERT"
 	echo "SSL insecure port redirect: $WO_SSL_INSECURE_PORT_REDIRECT"
 	echo "Celery Broker: $WO_BROKER"
+	echo "Default Nodes: $WO_DEFAULT_NODES"
 	echo "================================"
 	echo "Make sure to issue a $0 down if you decide to change the environment."
 	echo ""