Increase timeout and check for vault initialisation

Luke Addison · Luke Addison · commit d0a470bc86b1 · 2018-06-08T12:59:54.000+01:00
diff --git a/pkg/tarmak/vault/vault.go b/pkg/tarmak/vault/vault.go
@@ -24,7 +24,7 @@ const (
 	VaultStateUnsealed
 	VaultStateUnintialised
 	VaultStateErr
-	vaultTunnelCreationTimeoutSeconds = 5
+	vaultTunnelCreationTimeoutSeconds = 100
 )
 
 const (
@@ -108,7 +108,7 @@ func (v *Vault) TunnelFromFQDNs(vaultInternalFQDNs []string, vaultCA string) (in
 				return
 			}
 
-			if health.Standby == false && health.Sealed == false {
+			if health.Standby == false && health.Sealed == false && health.Initialized == true {
 				activeNode <- pos
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ const (`
`24`	`24`	`VaultStateUnsealed`
`25`	`25`	`VaultStateUnintialised`
`26`	`26`	`VaultStateErr`
`27`		`- vaultTunnelCreationTimeoutSeconds = 5`
	`27`	`+ vaultTunnelCreationTimeoutSeconds = 100`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`const (`
`@@ -108,7 +108,7 @@ func (v *Vault) TunnelFromFQDNs(vaultInternalFQDNs []string, vaultCA string) (in`
`108`	`108`	`return`
`109`	`109`	`}`
`110`	`110`
`111`		`- if health.Standby == false && health.Sealed == false {`
	`111`	`+ if health.Standby == false && health.Sealed == false && health.Initialized == true {`
`112`	`112`	`activeNode <- pos`
`113`	`113`	`}`
`114`	`114`