Compare commits
No commits in common. "ddc85e470440f9347f61584695ca75c9df6fe426" and "ede69833213bcc8c10aa712586794fb6f5176e55" have entirely different histories.
ddc85e4704
...
ede6983321
@ -5,7 +5,6 @@ node.reverse_merge!({
|
|||||||
'nomad' => {
|
'nomad' => {
|
||||||
'manager' => false,
|
'manager' => false,
|
||||||
'client' => false,
|
'client' => false,
|
||||||
'consul_token' => "f1d577dc-9216-d72a-cc09-1962b1009273",
|
|
||||||
'lokiendpoint' => 'loki.service.consul:3100',
|
'lokiendpoint' => 'loki.service.consul:3100',
|
||||||
'synology' => '192.168.10.200'
|
'synology' => '192.168.10.200'
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,6 +6,6 @@ client {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
consul {
|
# consul {
|
||||||
token = "<%= @consul_token %>"
|
# token = "11800359-1330-fe54-d858-44e8de9a14f6"
|
||||||
}
|
# }
|
||||||
@ -1,23 +0,0 @@
|
|||||||
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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -38,25 +38,15 @@ end
|
|||||||
|
|
||||||
if node['nomad']['client']
|
if node['nomad']['client']
|
||||||
%w( /etc/nomad.d/client.hcl ).each do |conf|
|
%w( /etc/nomad.d/client.hcl ).each do |conf|
|
||||||
template conf do
|
remote_file conf do
|
||||||
owner 'nomad'
|
owner 'nomad'
|
||||||
group 'nomad'
|
group 'nomad'
|
||||||
mode '664'
|
mode '664'
|
||||||
|
|
||||||
variables(consul_token: node['nomad']['consul_token'])
|
|
||||||
|
|
||||||
notifies :restart, 'service[nomad]'
|
notifies :restart, 'service[nomad]'
|
||||||
end
|
end
|
||||||
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
|
directory '/etc/nomad.d/jobs' do
|
||||||
owner 'nomad'
|
owner 'nomad'
|
||||||
group 'nomad'
|
group 'nomad'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user