diff --git a/deploy/asapo_services/asap3.tfvars b/deploy/asapo_services/asap3.tfvars index c3c5434b8828865ead3f552ff91240392cedabe8..4ff7c3cb46700d4f61dc52eea6f5e3524fc267ab 100644 --- a/deploy/asapo_services/asap3.tfvars +++ b/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 diff --git a/deploy/asapo_services/scripts/asapo-services.nmd.tpl b/deploy/asapo_services/scripts/asapo-services.nmd.tpl index 9cb6298aa08ab6edf9b2f3897c21ead5a7dd9514..f7ccfd518f4adbddd2b8f3be1c0f766d179684b8 100644 --- a/deploy/asapo_services/scripts/asapo-services.nmd.tpl +++ b/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 { diff --git a/deploy/asapo_services/scripts/asapo.auto.tfvars.in b/deploy/asapo_services/scripts/asapo.auto.tfvars.in index 764b672753af79dcad8aebf46aa1205e6672a9f9..98ffb7244e1437d9a6fd523667da29ef1fcaa2a9 100644 --- a/deploy/asapo_services/scripts/asapo.auto.tfvars.in +++ b/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 diff --git a/deploy/asapo_services/scripts/authorizer.json.tpl b/deploy/asapo_services/scripts/authorizer.json.tpl index f3a66ed5acafb9f9dc8c4579d2fa04b494eba47d..3aecc0df652245b0f4c51ed5008301f17cee10fd 100644 --- a/deploy/asapo_services/scripts/authorizer.json.tpl +++ b/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)" } diff --git a/deploy/asapo_services/scripts/templates.tf b/deploy/asapo_services/scripts/templates.tf index e5dae73a5b2e39f2550df7de744e1142ed60d962..5815e2672bad509eb76e2b512444e5926ab1b0f0 100644 --- a/deploy/asapo_services/scripts/templates.tf +++ b/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}" diff --git a/deploy/asapo_services/scripts/vars.tf b/deploy/asapo_services/scripts/vars.tf index 2e95cf15a863cff1d0565cf5f36d9e4cb0c5bcd3..41df4f06f5e92f4a85e0d41f81c17d94f716723f 100644 --- a/deploy/asapo_services/scripts/vars.tf +++ b/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