diff options
27 files changed, 787 insertions, 72 deletions
diff --git a/resources/tools/terraform/1n_nmd/.gitignore b/resources/tools/terraform/1n_nmd/.gitignore new file mode 100644 index 0000000000..fc64f0039f --- /dev/null +++ b/resources/tools/terraform/1n_nmd/.gitignore @@ -0,0 +1,4 @@ +.terraform/ +.terraform.tfstate.lock.info +terraform.tfstate +terraform.tfstate.backup diff --git a/resources/tools/terraform/1n_nmd/main.tf b/resources/tools/terraform/1n_nmd/main.tf new file mode 100644 index 0000000000..330f647476 --- /dev/null +++ b/resources/tools/terraform/1n_nmd/main.tf @@ -0,0 +1,40 @@ +terraform { + # This module is now only being tested with Terraform 0.13.5+. + required_version = ">= 0.13.5" +} + +provider "nomad" { + address = var.nomad_provider_address + alias = "yul1" +} + +# For convenience in simple configurations, a child module automatically +# inherits default (un-aliased) provider configurations from its parent. +# This means that explicit provider blocks appear only in the root module, +# and downstream modules can simply declare resources for that provider +# and have them automatically associated with the root provider +# configurations. + +# prod_storage +# + prod-group1-nginx +# + prod-group1-storage +# + services +# + docs.nginx.service.consul +# + logs.nginx.service.consul +# + storage.nginx.service.consul +module "prod_storage" { + source = "./prod_storage" + providers = { + nomad = nomad.yul1 + } +} + +# prod_vpp_device +# + prod-csit-shim-amd +# + prod-csit-shim-arm +module "prod_vpp_device" { + source = "./prod_vpp_device" + providers = { + nomad = nomad.yul1 + } +}
\ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/prod_storage/prod-nginx.nomad b/resources/tools/terraform/1n_nmd/prod_storage/prod-nginx.nomad new file mode 100644 index 0000000000..6c153ffd03 --- /dev/null +++ b/resources/tools/terraform/1n_nmd/prod_storage/prod-nginx.nomad @@ -0,0 +1,243 @@ +job "prod-nginx" { + # The "region" parameter specifies the region in which to execute the job. + # If omitted, this inherits the default region name of "global". + # region = "global" + # + # The "datacenters" parameter specifies the list of datacenters which should + # be considered when placing this task. This must be provided. + datacenters = [ "yul1" ] + + # The "type" parameter controls the type of job, which impacts the scheduler's + # decision on placement. This configuration is optional and defaults to + # "service". For a full list of job types and their differences, please see + # the online documentation. + # + # For more information, please see the online documentation at: + # + # https://www.nomadproject.io/docs/jobspec/schedulers.html + # + type = "service" + + update { + # The "max_parallel" parameter specifies the maximum number of updates to + # perform in parallel. In this case, this specifies to update a single task + # at a time. + max_parallel = 0 + + # The "min_healthy_time" parameter specifies the minimum time the allocation + # must be in the healthy state before it is marked as healthy and unblocks + # further allocations from being updated. + min_healthy_time = "10s" + + # The "healthy_deadline" parameter specifies the deadline in which the + # allocation must be marked as healthy after which the allocation is + # automatically transitioned to unhealthy. Transitioning to unhealthy will + # fail the deployment and potentially roll back the job if "auto_revert" is + # set to true. + healthy_deadline = "3m" + + # The "progress_deadline" parameter specifies the deadline in which an + # allocation must be marked as healthy. The deadline begins when the first + # allocation for the deployment is created and is reset whenever an allocation + # as part of the deployment transitions to a healthy state. If no allocation + # transitions to the healthy state before the progress deadline, the + # deployment is marked as failed. + progress_deadline = "10m" + + # The "auto_revert" parameter specifies if the job should auto-revert to the + # last stable job on deployment failure. A job is marked as stable if all the + # allocations as part of its deployment were marked healthy. + auto_revert = false + + # The "canary" parameter specifies that changes to the job that would result + # in destructive updates should create the specified number of canaries + # without stopping any previous allocations. Once the operator determines the + # canaries are healthy, they can be promoted which unblocks a rolling update + # of the remaining allocations at a rate of "max_parallel". + # + # Further, setting "canary" equal to the count of the task group allows + # blue/green deployments. When the job is updated, a full set of the new + # version is deployed and upon promotion the old version is stopped. + canary = 0 + } + + # The "group" stanza defines a series of tasks that should be co-located on + # the same Nomad client. Any task within a group will be placed on the same + # client. + # + # For more information and examples on the "group" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/group.html + # + group "prod-group1-nginx" { + # The "count" parameter specifies the number of the task groups that should + # be running under this group. This value must be non-negative and defaults + # to 1. + count = 1 + + # All groups in this job should be scheduled on different hosts. + constraint { + operator = "distinct_hosts" + value = "false" + } + + # Prioritize one node. + affinity { + attribute = "${attr.unique.hostname}" + value = "s46-nomad" + weight = 100 + } + + # https://www.nomadproject.io/docs/job-specification/volume + volume "prod-volume1-storage" { + type = "host" + read_only = false + source = "prod-volume-data1-1" + } + + # The "task" stanza creates an individual unit of work, such as a Docker + # container, web application, or batch processing. + # + # For more information and examples on the "task" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/task.html + # + task "prod-task1-nginx" { + # The "driver" parameter specifies the task driver that should be used to + # run the task. + driver = "docker" + + volume_mount { + volume = "prod-volume1-storage" + destination = "/data/" + read_only = true + } + + # The "config" stanza specifies the driver configuration, which is passed + # directly to the driver to start the task. The details of configurations + # are specific to each driver, so please see specific driver + # documentation for more information. + config { + image = "nginx:stable" + dns_servers = [ "${attr.unique.network.ip-address}" ] + port_map { + https = 443 + } + privileged = false + volumes = [ + "/etc/consul.d/ssl/consul.pem:/etc/ssl/certs/nginx-cert.pem", + "/etc/consul.d/ssl/consul-key.pem:/etc/ssl/private/nginx-key.pem", + "custom/logs.conf:/etc/nginx/conf.d/logs.conf", + "custom/docs.conf:/etc/nginx/conf.d/docs.conf" + ] + } + + # The "template" stanza instructs Nomad to manage a template, such as + # a configuration file or script. This template can optionally pull data + # from Consul or Vault to populate runtime configuration data. + # + # For more information and examples on the "template" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/template.html + # + template { + data = <<EOH + server { + listen 443 ssl default_server; + server_name logs.nginx.service.consul; + keepalive_timeout 70; + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 10m; + ssl_protocols TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384"; + ssl_certificate /etc/ssl/certs/nginx-cert.pem; + ssl_certificate_key /etc/ssl/private/nginx-key.pem; + location / { + root /data/logs.fd.io; + index _; + autoindex on; + autoindex_exact_size on; + autoindex_format html; + autoindex_localtime off; + } + location ~ \.(html.gz)$ { + root /data/logs.fd.io; + add_header Content-Encoding gzip; + add_header Content-Type text/html; + } + location ~ \.(txt.gz|log.gz)$ { + root /data/logs.fd.io; + add_header Content-Encoding gzip; + add_header Content-Type text/plain; + } + location ~ \.(xml.gz)$ { + root /data/logs.fd.io; + add_header Content-Encoding gzip; + add_header Content-Type application/xml; + } + } + EOH + destination = "custom/logs.conf" + } + template { + data = <<EOH + server { + listen 443 ssl; + server_name docs.nginx.service.consul; + keepalive_timeout 70; + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 10m; + ssl_protocols TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384"; + ssl_certificate /etc/ssl/certs/nginx-cert.pem; + ssl_certificate_key /etc/ssl/private/nginx-key.pem; + location / { + root /data/docs.fd.io; + index index.html index.htm; + } + } + EOH + destination = "custom/docs.conf" + } + + # The service stanza instructs Nomad to register a service with Consul. + # + # For more information and examples on the "task" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/service.html + # + service { + name = "nginx" + port = "https" + tags = [ "docs", "logs" ] + } + + # The "resources" stanza describes the requirements a task needs to + # execute. Resource requirements include memory, network, cpu, and more. + # This ensures the task will execute on a machine that contains enough + # resource capacity. + # + # For more information and examples on the "resources" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/resources.html + # + resources { + cpu = 1000 + memory = 1024 + network { + mode = "bridge" + port "https" { + static = 443 + } + } + } + } + } +}
\ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/prod_storage/prod-storage.nomad b/resources/tools/terraform/1n_nmd/prod_storage/prod-storage.nomad new file mode 100644 index 0000000000..4e8f7ecb98 --- /dev/null +++ b/resources/tools/terraform/1n_nmd/prod_storage/prod-storage.nomad @@ -0,0 +1,256 @@ +job "prod-storage" { + # The "region" parameter specifies the region in which to execute the job. + # If omitted, this inherits the default region name of "global". + # region = "global" + # + # The "datacenters" parameter specifies the list of datacenters which should + # be considered when placing this task. This must be provided. + datacenters = [ "yul1" ] + + # The "type" parameter controls the type of job, which impacts the scheduler's + # decision on placement. This configuration is optional and defaults to + # "service". For a full list of job types and their differences, please see + # the online documentation. + # + # For more information, please see the online documentation at: + # + # https://www.nomadproject.io/docs/jobspec/schedulers.html + # + type = "service" + + update { + # The "max_parallel" parameter specifies the maximum number of updates to + # perform in parallel. In this case, this specifies to update a single task + # at a time. + max_parallel = 0 + + # The "min_healthy_time" parameter specifies the minimum time the allocation + # must be in the healthy state before it is marked as healthy and unblocks + # further allocations from being updated. + min_healthy_time = "10s" + + # The "healthy_deadline" parameter specifies the deadline in which the + # allocation must be marked as healthy after which the allocation is + # automatically transitioned to unhealthy. Transitioning to unhealthy will + # fail the deployment and potentially roll back the job if "auto_revert" is + # set to true. + healthy_deadline = "3m" + + # The "progress_deadline" parameter specifies the deadline in which an + # allocation must be marked as healthy. The deadline begins when the first + # allocation for the deployment is created and is reset whenever an allocation + # as part of the deployment transitions to a healthy state. If no allocation + # transitions to the healthy state before the progress deadline, the + # deployment is marked as failed. + progress_deadline = "10m" + + # The "auto_revert" parameter specifies if the job should auto-revert to the + # last stable job on deployment failure. A job is marked as stable if all the + # allocations as part of its deployment were marked healthy. + auto_revert = false + + # The "canary" parameter specifies that changes to the job that would result + # in destructive updates should create the specified number of canaries + # without stopping any previous allocations. Once the operator determines the + # canaries are healthy, they can be promoted which unblocks a rolling update + # of the remaining allocations at a rate of "max_parallel". + # + # Further, setting "canary" equal to the count of the task group allows + # blue/green deployments. When the job is updated, a full set of the new + # version is deployed and upon promotion the old version is stopped. + canary = 0 + } + + # All groups in this job should be scheduled on different hosts. + constraint { + operator = "distinct_hosts" + value = "true" + } + + # the same Nomad client. Any task within a group will be placed on the same + # client. + # + # For more information and examples on the "group" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/group.html + # + group "prod-group1-storage" { + # The "count" parameter specifies the number of the task groups that should + # be running under this group. This value must be non-negative and defaults + # to 1. + count = 2 + + # Hard coding prefered node as primary. + affinity { + attribute = "${attr.unique.hostname}" + value = "s46-nomad" + weight = 100 + } + + # https://www.nomadproject.io/docs/job-specification/volume + volume "prod-volume1-storage" { + type = "host" + read_only = false + source = "prod-volume-data1-1" + } + + # The "task" stanza creates an individual unit of work, such as a Docker + # container, web application, or batch processing. + # + # For more information and examples on the "task" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/task.html + # + task "prod-task1-storage" { + # The "driver" parameter specifies the task driver that should be used to + # run the task. + driver = "docker" + + volume_mount { + volume = "prod-volume1-storage" + destination = "/data/" + read_only = false + } + + # The "config" stanza specifies the driver configuration, which is passed + # directly to the driver to start the task. The details of configurations + # are specific to each driver, so please see specific driver + # documentation for more information. + config { + image = "minio/minio:RELEASE.2020-11-19T23-48-16Z" + dns_servers = [ "${attr.unique.network.ip-address}" ] + command = "server" + args = [ "/data/" ] + port_map { + http = 9000 + } + privileged = false + } + + env { + MINIO_ACCESS_KEY = "minio" + MINIO_SECRET_KEY = "minio123" + MINIO_BROWSER = "off" + } + + # The service stanza instructs Nomad to register a service with Consul. + # + # For more information and examples on the "task" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/service.html + # + service { + name = "storage" + port = "http" + tags = [ "storage${NOMAD_ALLOC_INDEX}" ] + check { + name = "alive" + type = "http" + port = "http" + protocol = "http" + method = "GET" + path = "/minio/health/live" + interval = "10s" + timeout = "2s" + task = "${TASK}" + } + } + + # The "resources" stanza describes the requirements a task needs to + # execute. Resource requirements include memory, network, cpu, and more. + # This ensures the task will execute on a machine that contains enough + # resource capacity. + # + # For more information and examples on the "resources" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/resources.html + # + resources { + cpu = 2000 + memory = 2048 + network { + port "http" { + static = 9000 + } + } + } + } + + task "prod-task2-sync" { + # The "raw_exec" parameter specifies the task driver that should be used + # to run the task. + driver = "raw_exec" + + # The "template" stanza instructs Nomad to manage a template, such as + # a configuration file or script. This template can optionally pull data + # from Consul or Vault to populate runtime configuration data. + # + # For more information and examples on the "template" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/template.html + # + template { + data = <<EOH +#!/bin/bash + +INOTIFY_OPTONS="--recursive --monitor" +VOLUMES="/data/logs.fd.io /data/docs.fd.io" + +if [ '{{ env "attr.unique.network.ip-address" }}' = "10.32.8.14" ]; then +echo "Running notify daemon" + inotifywait -e moved_to ${INOTIFY_OPTONS} ${VOLUMES} | \ + while read path action file; do + key="testuser" + secret="Csit1234" + + resource=${path#"/data"}${file} + date=$(date -R) + _signature="PUT\n\napplication/octet-stream\n${date}\n${resource}" + signature=$(echo -en ${_signature} | openssl sha1 -hmac ${secret} -binary | base64) + + curl -v -X PUT -T "${path}${file}" \ + -H "Host: storage0.storage.service.consul:9000" \ + -H "Date: ${date}" \ + -H "Content-Type: application/octet-stream" \ + -H "Authorization: AWS ${key}:${signature}" \ + http://storage0.storage.service.consul:9000${resource} + done +else + while :; do sleep 2073600; done +fi + +EOH + destination = "local/sync.sh" + perms = "755" + } + + # The "config" stanza specifies the driver configuration, which is passed + # directly to the driver to start the task. The details of configurations + # are specific to each driver, so please see specific driver + # documentation for more information. + config { + command = "local/sync.sh" + } + + # The "resources" stanza describes the requirements a task needs to + # execute. Resource requirements include memory, network, cpu, and more. + # This ensures the task will execute on a machine that contains enough + # resource capacity. + # + # For more information and examples on the "resources" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/resources.html + # + resources { + cpu = 500 + memory = 256 + } + } + } +}
\ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/prod_storage/resources.tf b/resources/tools/terraform/1n_nmd/prod_storage/resources.tf new file mode 100644 index 0000000000..4c42927be6 --- /dev/null +++ b/resources/tools/terraform/1n_nmd/prod_storage/resources.tf @@ -0,0 +1,9 @@ +resource "nomad_job" "prod_nginx" { + provider = nomad + jobspec = file("${path.module}/prod-nginx.nomad") +} + +resource "nomad_job" "prod_storage" { + provider = nomad + jobspec = file("${path.module}/prod-storage.nomad") +}
\ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/prod_vpp_device/prod_csit_shim_amd.nomad b/resources/tools/terraform/1n_nmd/prod_vpp_device/prod_csit_shim_amd.nomad new file mode 100644 index 0000000000..1ba24696a4 --- /dev/null +++ b/resources/tools/terraform/1n_nmd/prod_vpp_device/prod_csit_shim_amd.nomad @@ -0,0 +1,100 @@ +job "prod-csit-shim-amd" { + # The "region" parameter specifies the region in which to execute the job. + # If omitted, this inherits the default region name of "global". + # region = "global" + # + # The "datacenters" parameter specifies the list of datacenters which should + # be considered when placing this task. This must be provided. + datacenters = [ "yul1" ] + + # The "type" parameter controls the type of job, which impacts the scheduler's + # decision on placement. This configuration is optional and defaults to + # "service". For a full list of job types and their differences, please see + # the online documentation. + # + # For more information, please see the online documentation at: + # + # https://www.nomadproject.io/docs/jobspec/schedulers.html + # + type = "system" + + constraint { + attribute = "${node.class}" + value = "csit" + } + + # The "group" stanza defines a series of tasks that should be co-located on + # the same Nomad client. Any task within a group will be placed on the same + # client. + # + # For more information and examples on the "group" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/group.html + # + group "prod-group1-csit-amd" { + # The "count" parameter specifies the number of the task groups that should + # be running under this group. This value must be non-negative and defaults + # to 1. + count = 2 + + restart { + interval = "1m" + attempts = 3 + delay = "15s" + mode = "delay" + } + + # The "task" stanza creates an individual unit of work, such as a Docker + # container, web application, or batch processing. + # + # For more information and examples on the "task" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/task.html + # + task "prod-task1-csit-amd" { + # The "driver" parameter specifies the task driver that should be used to + # run the task. + driver = "docker" + + # The "config" stanza specifies the driver configuration, which is passed + # directly to the driver to start the task. The details of configurations + # are specific to each driver, so please see specific driver + # documentation for more information. + config { + image = "snergster/csit-shim" + network_mode = "host" + pid_mode = "host" + volumes = [ + "/var/run/docker.sock:/var/run/docker.sock" + ] + privileged = true + } + + # The "resources" stanza describes the requirements a task needs to + # execute. Resource requirements include memory, network, cpu, and more. + # This ensures the task will execute on a machine that contains enough + # resource capacity. + # + # For more information and examples on the "resources" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/resources.html + # + resources { + cpu = 100 + memory = 128 + network { + mbits = 10 + port "ssh" { + static = 6022 + } + port "ssh2" { + static = 6023 + } + } + } + } + } +}
\ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/prod_vpp_device/prod_csit_shim_arm.nomad b/resources/tools/terraform/1n_nmd/prod_vpp_device/prod_csit_shim_arm.nomad new file mode 100644 index 0000000000..ba7b656d37 --- /dev/null +++ b/resources/tools/terraform/1n_nmd/prod_vpp_device/prod_csit_shim_arm.nomad @@ -0,0 +1,100 @@ +job "prod-csit-shim-arm" { + # The "region" parameter specifies the region in which to execute the job. + # If omitted, this inherits the default region name of "global". + # region = "global" + # + # The "datacenters" parameter specifies the list of datacenters which should + # be considered when placing this task. This must be provided. + datacenters = [ "yul1" ] + + # The "type" parameter controls the type of job, which impacts the scheduler's + # decision on placement. This configuration is optional and defaults to + # "service". For a full list of job types and their differences, please see + # the online documentation. + # + # For more information, please see the online documentation at: + # + # https://www.nomadproject.io/docs/jobspec/schedulers.html + # + type = "system" + + constraint { + attribute = "${node.class}" + value = "csitarm" + } + + # The "group" stanza defines a series of tasks that should be co-located on + # the same Nomad client. Any task within a group will be placed on the same + # client. + # + # For more information and examples on the "group" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/group.html + # + group "prod-group1-csit-arm" { + # The "count" parameter specifies the number of the task groups that should + # be running under this group. This value must be non-negative and defaults + # to 1. + count = 2 + + restart { + interval = "1m" + attempts = 3 + delay = "15s" + mode = "delay" + } + + # The "task" stanza creates an individual unit of work, such as a Docker + # container, web application, or batch processing. + # + # For more information and examples on the "task" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/task.html + # + task "prod-task1-csit-arm" { + # The "driver" parameter specifies the task driver that should be used to + # run the task. + driver = "docker" + + # The "config" stanza specifies the driver configuration, which is passed + # directly to the driver to start the task. The details of configurations + # are specific to each driver, so please see specific driver + # documentation for more information. + config { + image = "snergster/csit-arm-shim" + network_mode = "host" + pid_mode = "host" + volumes = [ + "/var/run/docker.sock:/var/run/docker.sock" + ] + privileged = true + } + + # The "resources" stanza describes the requirements a task needs to + # execute. Resource requirements include memory, network, cpu, and more. + # This ensures the task will execute on a machine that contains enough + # resource capacity. + # + # For more information and examples on the "resources" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/resources.html + # + resources { + cpu = 100 + memory = 128 + network { + mbits = 10 + port "ssh" { + static = 6022 + } + port "ssh2" { + static = 6023 + } + } + } + } + } +}
\ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/prod_vpp_device/resources.tf b/resources/tools/terraform/1n_nmd/prod_vpp_device/resources.tf new file mode 100644 index 0000000000..8dc101c12a --- /dev/null +++ b/resources/tools/terraform/1n_nmd/prod_vpp_device/resources.tf @@ -0,0 +1,9 @@ +resource "nomad_job" "prod_csit_shim_arm" { + provider = nomad + jobspec = file("${path.module}/prod_csit_shim_arm.nomad") +} + +resource "nomad_job" "prod_csit_shim_amd" { + provider = nomad + jobspec = file("${path.module}/prod_csit_shim_amd.nomad") +}
\ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/variables.tf b/resources/tools/terraform/1n_nmd/variables.tf new file mode 100644 index 0000000000..0782f8669c --- /dev/null +++ b/resources/tools/terraform/1n_nmd/variables.tf @@ -0,0 +1,5 @@ +variable "nomad_provider_address" { + description = "FD.io Nomad cluster address." + type = string + default = "http://nomad.service.consul:4646" +}
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml index 3965a27c88..a302d21426 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml @@ -53,7 +53,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml index 0d44927fee..fcd416678c 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.29.yaml @@ -52,7 +52,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml index 77f459fa8a..12546a2b59 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml @@ -54,7 +54,4 @@ consul_node_name: "{{ hostname }}" consul_node_role: "both" consul_retry_servers: - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml index 0871ff40f2..51f447ead3 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.32.yaml @@ -53,7 +53,4 @@ consul_node_name: "{{ hostname }}" consul_node_role: "both" consul_retry_servers: - "10.30.51.30" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml index 550e719881..19ec2c7ef4 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.33.yaml @@ -53,7 +53,4 @@ consul_node_name: "{{ hostname }}" consul_node_role: "both" consul_retry_servers: - "10.30.51.30" - - "10.30.51.32" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.32"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml index 5ce4c0a2a8..d55a48ecfd 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.34.yaml @@ -54,7 +54,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml index 918b2f459f..321c1597ac 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.35.yaml @@ -54,7 +54,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml index 65a8ae7796..23ebc52c1b 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml @@ -57,7 +57,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml index b3daacaaa1..de6cdd0b2a 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml @@ -57,7 +57,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml index bbceed229b..eee8bc942b 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.65.yaml @@ -56,7 +56,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.30.51.14" - - "10.30.51.15" - - "10.30.51.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml index da9c918272..89ade2c689 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.66.yaml @@ -56,7 +56,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.30.51.14" - - "10.30.51.15" - - "10.30.51.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml index a36c1151e0..a1f92eb71b 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.67.yaml @@ -56,7 +56,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.30.51.14" - - "10.30.51.15" - - "10.30.51.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml index 88f0026f41..50cb6c8cdb 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.68.yaml @@ -56,7 +56,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.30.51.14" - - "10.30.51.15" - - "10.30.51.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml index 5dcc572e3d..4c252ffc32 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml @@ -61,7 +61,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml index 66c5db6fb1..e976c2c413 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml @@ -61,7 +61,4 @@ consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml index 8d1653bce9..2109090698 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml @@ -55,10 +55,8 @@ consul_certificates: consul_datacenter: "yul1" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ hostname }}" -consul_node_role: "both" +consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.15" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml index 94104d6baf..a00e97ebd7 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml @@ -55,10 +55,8 @@ consul_certificates: consul_datacenter: "yul1" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ hostname }}" -consul_node_role: "both" +consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.16"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml index a5ffb91825..7a97c9757c 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml @@ -51,10 +51,8 @@ consul_certificates: consul_datacenter: "yul1" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ hostname }}" -consul_node_role: "both" +consul_node_role: "client" consul_retry_servers: - "10.30.51.30" - "10.30.51.32" - - "10.30.51.33" - - "10.32.8.14" - - "10.32.8.15"
\ No newline at end of file + - "10.30.51.33"
\ No newline at end of file |