Merge pull request #166 in ASAPO/asapo from...

Merge pull request #166 in ASAPO/asapo from feature_ASAPO-132-ldap-address-in-terraform-config to develop

* commit 'e84250c4':
  ldap_uri

deploy/asapo_services/asap3.tfvars

@@ -13,11 +13,13 @@ mongo_dir="/gpfs/asapo/shared/service_dir/mongodb"
 asapo_user="35841:1000"
 job_scripts_dir="/gpfs/asapo/shared/terraform"
 
+ldap_uri="ldap://it-ldap-slave.desy.de:1389"
+
 receiver_total_memory_size = 35000
 receiver_dataserver_cache_size = 30 #gb
 receiver_receive_to_disk_threshold = 50 # mb
 receiver_dataserver_nthreads = 8
-receiver_network_modes = "tcp,fabric"
+receiver_network_modes = "tcp"
 
 grafana_total_memory_size = 2000
 influxdb_total_memory_size = 2000
@@ -28,8 +30,8 @@ mongo_total_memory_size = 20000
 authorizer_total_memory_size = 512
 discovery_total_memory_size = 512
 
-n_receivers = 1
-n_brokers = 1
-n_fts = 1
+n_receivers = 2
+n_brokers = 2
+n_fts = 2
 
 

deploy/asapo_services/scripts/asapo-services.nmd.tpl

@@ -48,6 +48,7 @@ job "asapo-services" {
       meta {
         offline_dir = "${offline_dir}"
         online_dir = "${online_dir}"
+        ldap_uri = "${ldap_uri}"
       }
 
       service {

deploy/asapo_services/scripts/asapo.auto.tfvars.in

@@ -33,6 +33,7 @@ mongo_total_memory_size = 256
 authorizer_total_memory_size = 256
 discovery_total_memory_size = 256
 
+ldap_uri = "ldap://localhost:389"
 
 grafana_port = 3301
 influxdb_port = 8086

deploy/asapo_services/scripts/authorizer.json.tpl

@@ -11,7 +11,7 @@
   "TokenDurationMin":600,
   "Ldap":
     {
-        "Uri" : "ldap://localhost:389",
+        "Uri" : "{{ env "NOMAD_META_ldap_uri" }}",
         "BaseDn" : "ou=rgy,o=desy,c=de",
         "FilterTemplate" : "(cn=a3__BEAMLINE__-hosts)"
     }

deploy/asapo_services/scripts/templates.tf

@@ -22,6 +22,7 @@ data "template_file" "asapo_services" {
     scripts_dir = "${var.job_scripts_dir}"
     online_dir = "${var.online_dir}"
     offline_dir = "${var.offline_dir}"
+    ldap_uri = "${var.ldap_uri}"
     image_suffix = "${var.asapo_imagename_suffix}:${var.asapo_image_tag}"
     nomad_logs = "${var.nomad_logs}"
     authorizer_total_memory_size = "${var.authorizer_total_memory_size}"

deploy/asapo_services/scripts/vars.tf

@@ -85,4 +85,6 @@ variable "n_receivers" {}
 
 variable "n_brokers" {}
 
-variable "n_fts" {}
\ No newline at end of file
+variable "n_fts" {}
+
+variable "ldap_uri" {}
\ No newline at end of file