FIX: Ansible storage bugs

- daily digest

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ifa2dc10831fde0a101c916f2b8abd26abb93cb7f

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 dd2a2f5..9a2f862 100644 (file)
--- 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_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
 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" ]
   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"
 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 7e103cf..e929c59 100644 (file)
--- 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" ]
   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:
 nomad_volumes:

-  - name: "prod-volume-data2-1"
+  - name: "prod-volume-data1-1"

     path: "/data"
     read_only: false
 
     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 e1b47ca..1e1f1a3 100644 (file)
--- 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" ]
   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
 
 # 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 6a4e238..652392e 100644 (file)
--- 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" ]
   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
 
 # 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 6877211..62d143f 100644 (file)
--- 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
 }
 
   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