aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-03-04 06:24:13 +0000
committerPeter Mikus <pmikus@cisco.com>2021-03-04 06:38:53 +0000
commit99fa53e40c84f0d90fa23a060b8e9e0b9dc10c79 (patch)
tree44d11bc32c929acd10b3303c3a07934750ec0e24
parent1d7a226c6d9b237cdb034e40ededbfcc1094f363 (diff)
FIX: Ansible storage bugs
- daily digest Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: Ifa2dc10831fde0a101c916f2b8abd26abb93cb7f
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml4
-rw-r--r--terraform-ci-infra/1n_nmd/minio/main.tf16
5 files changed, 20 insertions, 12 deletions
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 dd2a2f5b95..9a2f862d69 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
@@ -29,7 +29,7 @@ nomad_datacenter: "yul1"
nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
nomad_name: "{{ hostname }}-{{ ansible_architecture }}"
nomad_node_role: "client"
-nomad_node_class: "s5ci"
+nomad_node_class: "builder"
nomad_options:
driver.raw_exec.enable: 1
docker.cleanup.image: true
@@ -38,7 +38,7 @@ nomad_options:
driver.whitelist: "docker,raw_exec,exec"
fingerprint.network.disallow_link_local: true
nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ]
-nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ]
+nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647", "10.30.51.30:4647" ]
nomad_volumes:
- name: "prod-volume-data1-1"
path: "/data"
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 7e103cf8c7..e929c59a6e 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
@@ -38,9 +38,9 @@ nomad_options:
driver.whitelist: "docker,raw_exec,exec"
fingerprint.network.disallow_link_local: true
nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ]
-nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647" ]
+nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647", "10.30.51.30:4647" ]
nomad_volumes:
- - name: "prod-volume-data2-1"
+ - name: "prod-volume-data1-1"
path: "/data"
read_only: false
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 e1b47cae15..1e1f1a31d2 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
@@ -39,6 +39,10 @@ nomad_options:
fingerprint.network.disallow_link_local: true
nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ]
nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647", "10.30.51.30:4647" ]
+nomad_volumes:
+ - name: "prod-volume-data1-1"
+ path: "/data"
+ read_only: false
# Consul settigs.
consul_nomad_integration: true
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml
index 6a4e238bdc..652392eddf 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml
@@ -39,6 +39,10 @@ nomad_options:
fingerprint.network.disallow_link_local: true
nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ]
nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647", "10.30.51.30:4647" ]
+nomad_volumes:
+ - name: "prod-volume-data1-1"
+ path: "/data"
+ read_only: false
# Consul settigs.
consul_nomad_integration: true
diff --git a/terraform-ci-infra/1n_nmd/minio/main.tf b/terraform-ci-infra/1n_nmd/minio/main.tf
index 6877211e6a..62d143f4b1 100644
--- a/terraform-ci-infra/1n_nmd/minio/main.tf
+++ b/terraform-ci-infra/1n_nmd/minio/main.tf
@@ -72,11 +72,11 @@ resource "nomad_job" "nomad_job_minio" {
detach = false
}
-resource "nomad_job" "nomad_job_mc" {
- jobspec = data.template_file.nomad_job_mc.rendered
- detach = false
-
- depends_on = [
- nomad_job.nomad_job_minio
- ]
-} \ No newline at end of file
+#resource "nomad_job" "nomad_job_mc" {
+# jobspec = data.template_file.nomad_job_mc.rendered
+# detach = false
+#
+# depends_on = [
+# nomad_job.nomad_job_minio
+# ]
+#} \ No newline at end of file