From 818354f34a782d94d15c4f83bd4a35654c17430f Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Thu, 18 Aug 2016 12:03:50 -0700 Subject: [PATCH 1/5] Enabling vault if token is present --- command/agent/agent.go | 5 +++++ nomad/structs/config/vault.go | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/command/agent/agent.go b/command/agent/agent.go index 753253d67..b6e94881b 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -241,6 +241,11 @@ func (a *Agent) serverConfig() (*nomad.Config, error) { // Add the Consul and Vault configs conf.ConsulConfig = a.config.Consul + + // Enable vault if the token is present + if strings.TrimSpace(a.config.Vault.Token) != "" { + a.config.Vault.Enabled = true + } conf.VaultConfig = a.config.Vault return conf, nil diff --git a/nomad/structs/config/vault.go b/nomad/structs/config/vault.go index c93de23d4..d97909f18 100644 --- a/nomad/structs/config/vault.go +++ b/nomad/structs/config/vault.go @@ -73,7 +73,6 @@ type VaultConfig struct { // `vault` configuration. func DefaultVaultConfig() *VaultConfig { return &VaultConfig{ - Enabled: true, AllowUnauthenticated: false, Addr: "https://vault.service.consul:8200", ConnectionRetryIntv: DefaultVaultConnectRetryIntv, From ff90554826668cdd089ff9429dab13de6e4944a0 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Thu, 18 Aug 2016 12:12:03 -0700 Subject: [PATCH 2/5] removing the agent config --- command/agent/agent.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/command/agent/agent.go b/command/agent/agent.go index b6e94881b..753253d67 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -241,11 +241,6 @@ func (a *Agent) serverConfig() (*nomad.Config, error) { // Add the Consul and Vault configs conf.ConsulConfig = a.config.Consul - - // Enable vault if the token is present - if strings.TrimSpace(a.config.Vault.Token) != "" { - a.config.Vault.Enabled = true - } conf.VaultConfig = a.config.Vault return conf, nil From 7f844d61245931439691b0511cc4dc86677009a3 Mon Sep 17 00:00:00 2001 From: The Gitter Badger Date: Thu, 18 Aug 2016 21:46:33 +0000 Subject: [PATCH 3/5] Add Gitter badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9ab6888d3..38abb101d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travis-ci.org/hashicorp/nomad) ========= +[![Join the chat at https://gitter.im/hashicorp-nomad/Lobby](https://badges.gitter.im/hashicorp-nomad/Lobby.svg)](https://gitter.im/hashicorp-nomad/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + - Website: https://www.nomadproject.io - IRC: `#nomad-tool` on Freenode - Mailing list: [Google Groups](https://groups.google.com/group/nomad-tool) From 04a46cd165b2f75f28819e73c36eb8fcced9f994 Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Thu, 18 Aug 2016 14:47:56 -0700 Subject: [PATCH 4/5] Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 38abb101d..b74ba9e27 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ -Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travis-ci.org/hashicorp/nomad) +Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travis-ci.org/hashicorp/nomad) [![Join the chat at https://gitter.im/hashicorp-nomad/Lobby](https://badges.gitter.im/hashicorp-nomad/Lobby.svg)](https://gitter.im/hashicorp-nomad/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ========= - -[![Join the chat at https://gitter.im/hashicorp-nomad/Lobby](https://badges.gitter.im/hashicorp-nomad/Lobby.svg)](https://gitter.im/hashicorp-nomad/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - - Website: https://www.nomadproject.io - IRC: `#nomad-tool` on Freenode - Mailing list: [Google Groups](https://groups.google.com/group/nomad-tool) From d85b73ed90803223c845172f0f520e5e306dde3f Mon Sep 17 00:00:00 2001 From: Lars Cromley Date: Thu, 18 Aug 2016 17:58:14 -0400 Subject: [PATCH 5/5] Updating vagrant file for v0.4.1, logs section of tutorial references 0.4.1 --- demo/vagrant/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/vagrant/Vagrantfile b/demo/vagrant/Vagrantfile index afb075bf9..1fa803fbf 100644 --- a/demo/vagrant/Vagrantfile +++ b/demo/vagrant/Vagrantfile @@ -9,7 +9,7 @@ sudo apt-get install -y unzip curl wget vim # Download Nomad echo Fetching Nomad... cd /tmp/ -curl -sSL https://releases.hashicorp.com/nomad/0.4.0/nomad_0.4.0_linux_amd64.zip -o nomad.zip +curl -sSL https://releases.hashicorp.com/nomad/0.4.1/nomad_0.4.1_linux_amd64.zip -o nomad.zip echo Installing Nomad... unzip nomad.zip