Merge pull request #67 in ASAPO/asapo from feature_clients-devops to develop

* commit 'f228dbee':
  update configuration
  add license info
  update test, move asapo client template to submodule
  refactor docker images, add examples
  improve output
  add nginx and co to the image
  refactor deploy scripts#

deploy/asapo/nomad.hcl.tpl → deploy/nomad_consul_docker/nomad.hcl.tpl

@@ -5,7 +5,7 @@ advertise {
 }
 
 acl {
-  enabled = true
+  enabled = $acl_enabled
 }
 
 server {
@@ -39,3 +39,12 @@ plugin "docker" {
   }
 }
 
+telemetry {
+  publish_allocation_metrics = $use_telemetry
+  publish_node_metrics       = $use_telemetry
+  statsd_address = "$telegraf_address"
+  collection_interval = "10s"
+}
+
+
+

deploy/asapo/orchestr_config.py → deploy/nomad_consul_docker/orchestr_config.py

@@ -44,10 +44,14 @@ def set_parameters():
     else:
         d['bootstrap_expect_string'] = ""
     d['ib_address']=my_get_env('IB_ADDRESS',"none")
+    d['acl_enabled']=my_get_env('ACL_ENABLED',"false")
     d['nomad_alloc_dir']=my_get_env('NOMAD_ALLOC_DIR','')
     d['recursors']=my_get_env('RECURSORS','["8.8.8.8"]')
     lightweight_service_nodes=my_get_env('ASAPO_LIGHTWEIGHT_SERVICE_NODES','[]')
     d['is_asapo_lightweight_service_node']=in_server_list(d['advertise_ip'],lightweight_service_nodes, True)
+    d['use_telemetry'] = my_get_env('NOMAD_TELEMETRY','false')
+    d['telegraf_address'] = my_get_env('TELEGRAF_ADDRESS','localhost:8125')
+
     return d
 
 def process_file(file_in,file_out):

deploy/nomad_consul_docker/run.sh

+#!/usr/bin/env bash
+
+NOMAD_ALLOC_HOST_SHARED=/tmp/asapo/container_host_shared/nomad_alloc
+
+ASAPO_USER=`id -u`:`id -g`
+
+mkdir -p $NOMAD_ALLOC_HOST_SHARED
+chmod 777 $NOMAD_ALLOC_HOST_SHARED
+
+docker run --privileged --rm -v /var/run/docker.sock:/var/run/docker.sock \
+  -u $ASAPO_USER \
+  --group-add `getent group docker | cut -d: -f3` \
+  -v /var/lib/docker:/var/lib/docker \
+  -v $NOMAD_ALLOC_HOST_SHARED:$NOMAD_ALLOC_HOST_SHARED \
+  -e NOMAD_ALLOC_DIR=$NOMAD_ALLOC_HOST_SHARED \
+  --name asapo --net=host -d yakser/asapo-nomad-cluster
+

tests/automatic/consumer/consumer_api_python/consumer_api.py

@@ -187,7 +187,7 @@ def check_dataset(broker,group_id_new):
 
 source, path, beamtime, token, mode = sys.argv[1:]
 
-broker = asapo_consumer.create_server_broker(source,path, beamtime,"",token,1000)
+broker = asapo_consumer.create_server_broker(source,path, beamtime,"",token,5000)
 
 group_id_new = broker.generate_group_id()
 

tests/automatic/settings/nginx.conf.tpl

@@ -16,7 +16,7 @@ http {
 
     resolver 127.0.0.1:8600 valid=1s;
     server {
-          listen {{ env "NOMAD_PORT_nginx" }};
+          listen {{ env "NOMAD_PORT_nginx" }} reuseport;
           set $discovery_endpoint discovery.service.asapo;
           set $authorizer_endpoint authorizer.service.asapo;
           set $fluentd_endpoint fluentd.service.asapo;