Correct vars to fix #18

ansible-community · May 28, 2017 · 5e14f2f · 5e14f2f
1 parent 36aa3ba
commit 5e14f2f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -264,3 +264,7 @@
 - Vault version 0.7.2
 - Minor play updates
 - Move asserts to asserts.yml file (thanks @groggemans)
+
+## v1.6.3
+
+- Correct Vault Enterprise variables to address #18
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,9 +1,7 @@
 ---
 # File: defaults/main.yml - Main default variables for Vault
 
-vault_version: "{{ lookup('env','VAULT_VERSION') | default('0.7.1', true) }}"
-vault_version: "{{ lookup('env','VAULT_ENTERPRISE_VERSION') | default('0.7.2', true) }}"
-vault_enterprise: "{{ lookup('env','VAULT_ENTERPRISE') | default(false, true) }}"
+vault_version: "{{ lookup('env','VAULT_VERSION') | default('0.7.2', true) }}"
 vault_architecture_map:
   # this first entry seems... redundant (but it's required for reasons)
   amd64: amd64
@@ -64,7 +62,8 @@ vault_shasums: "vault_{{ vault_version }}_SHA256SUMS"
 
 ### Vault Enterprise
 
-vault_enterprise_pkg: "vault-enterprise_{{ vault_enterorise_version }}+ent_{{ vault_os }}_{{ vault_architecture }}.zip"
+vault_enterprise: "{{ lookup('env','VAULT_ENTERPRISE') | default(false, true) }}"
+vault_enterprise_pkg: "vault-enterprise_{{ vault_version }}+ent_{{ vault_os }}_{{ vault_architecture }}.zip"
 vault_enterprise_shasums: "vault-enterprise_{{ vault_enterprise_version }}+ent_SHA256SUMS"
 
 ### Install Method

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.6.2
+v1.6.3