Add support for nomad.env file / Add nomad 1.0.5 support #50
Conversation
manifests/init.pp
Outdated
| @@ -148,6 +150,7 @@ | |||
| Boolean $manage_service = true, | |||
| Boolean $manage_service_file = false, | |||
| Boolean $restart_on_change = true, | |||
| Array[String[3]] $env_vars = [], | |||
There was a problem hiding this comment.
shortest possible env var would be something like A=B. I think a lower string length isn't possible.
There was a problem hiding this comment.
Empty value to unset something? Also wondering if you want to make it a hash instead.
There was a problem hiding this comment.
Optional[Array[String[3]]] $env_vars = [],Might be more clear here.
There was a problem hiding this comment.
That doesn't make sense. It's equivalent to:
Variant[Undef, Array[String[3]]] $env_vars = [],However, if you "call" it as such:
class { 'nomad':
env_vars => undef,
}Then Puppet resolves it to what the default is, which is []. Thus there is no way to pass in undef and Optional is just redundant.
There was a problem hiding this comment.
I updated it to work with a hash. can you please take a look again?
bastelfreak
force-pushed
the
105
branch
4 times, most recently
from
5db4d80 to
7ebc4a4
Compare
Nomad 1.0.5 ships a new systemd unit file with the following line: ``` EnvironmentFile=/etc/nomad.d/nomad.env ``` because there is no `-` before the leading `/`, the file is required. Currently this module purges all unknown files in the nomad config directory. This patch adds an `$env_vars` variable where people can pass environment variables to nomad. They will be written to the nomad.env file. The upstream packages provide the file: ``` reroot@server02 ~ # repoquery -l nomad | grep env /etc/nomad.d/nomad.env root@server02 ~ # rpm -qa | grep nomad nomad-1.0.5-1.x86_64 root@server02 ~ # ```
system ❯ nomad -version
Nomad v1.0.5 (0b870631cfa0c8e52cf698d7a7cc7989fbaec576)
system ❯ dpkg -L nomad | grep env
/etc/nomad.d/nomad.envThe file in the repo and described solution in the docs dont for now, nor was this mentioned in the release/changelog; very interesting, but i am seeing the same thing on ubuntu, so it must be real ;-). |
While working on voxpupuli/puppet-nomad/pull/50 we observed that the released version of this file and the file in this repo are not in sync. This PR brings the systemd service file in sync with what is currently packaged into the rpm and deb packages as released in the HashiCorp repositories. I am not sure how/where to update the [deployment guide](https://learn.hashicorp.com/tutorials/nomad/production-deployment-guide-vm-with-consul#configure-systemd)
| group => 'root', | ||
| mode => $nomad::config_mode, | ||
| content => "${content}\n", | ||
| require => File[$nomad::config_dir], |
There was a problem hiding this comment.
Isn't this done by default for file since Puppet 2.7?
While working on voxpupuli/puppet-nomad/pull/50 we observed that the released version of this file and the file in this repo are not in sync. This PR brings the systemd service file in sync with what is currently packaged into the rpm and deb packages as released in the HashiCorp repositories. I am not sure how/where to update the [deployment guide](https://learn.hashicorp.com/tutorials/nomad/production-deployment-guide-vm-with-consul#configure-systemd)
Nomad 1.0.5 ships a new systemd unit file with the following line:
because there is no
-before the leading/, the file is required.Currently this module purges all unknown files in the nomad config
directory. This patch adds an
$env_varsvariable where people can passenvironment variables to nomad. They will be written to the nomad.env
file. The upstream packages provide the file:
Pull Request (PR) description
This Pull Request (PR) fixes the following issues