Merge pull request 'modify-nomad-configs' (#19) from modify-nomad-configs into main

Reviewed-on: #19

cookbooks/nomad/attributes.rb

@@ -5,6 +5,7 @@ node.reverse_merge!({
   'nomad' => {
     'manager' => false,
     'client' => false,
+    'consul_token' => "f1d577dc-9216-d72a-cc09-1962b1009273",
     'lokiendpoint' => 'loki.service.consul:3100',
     'synology' => '192.168.10.200'
   }

cookbooks/nomad/files/etc/nomad.d/options.hcl

@@ -0,0 +1,23 @@
+plugin "docker" {
+  config {
+    # extra Docker labels to be set by Nomad on each Docker container with the appropriate value
+    extra_labels = ["job_name", "task_group_name", "task_name", "namespace", "node_name"]
+
+    volumes {
+      enabled = true
+    }
+
+    allow_privileged = true
+  }
+}
+
+client {
+  host_volume "docker-sock" {
+    path = "/var/run/docker.sock"
+  }
+
+  host_volume "tmp" {
+    path = "/tmp"
+  }
+}
+

cookbooks/nomad/setup.rb

@@ -38,15 +38,25 @@ end
 
 if node['nomad']['client']
   %w( /etc/nomad.d/client.hcl  ).each do |conf|
-    remote_file conf do
+    template conf do
       owner 'nomad'
       group 'nomad'
       mode '664'
 
+      variables(consul_token: node['nomad']['consul_token'])
+
       notifies :restart, 'service[nomad]'
     end
   end
 
+  remote_file "/etc/nomad.d/options.hcl" do
+    mode   "0644"
+    owner  "nomad"
+    group  "nomad"
+
+    notifies :restart, 'service[nomad]'
+  end
+
   directory '/etc/nomad.d/jobs' do
     owner 'nomad'
     group 'nomad'

cookbooks/nomad/templates/etc/nomad.d/client.hcl

@@ -6,6 +6,6 @@ client {
   }
 }
 
-# consul {
+consul {
-#   token = "11800359-1330-fe54-d858-44e8de9a14f6"
+  token = "<%= @consul_token %>"
-# }
+}