Skip to content

Commit

Permalink
Minor fixes and cleanup
Browse files Browse the repository at this point in the history
- Enterprise task changes
- Add `vault_install_remotely` docs
- Add `vault_remote_tmp` variable and use it
- Rename `cluster_nodes` label to `vault_instances`
  • Loading branch information
brianshumate committed Aug 2, 2017
1 parent 4f3be12 commit b431b4d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,9 @@
- Vault version 0.7.3
- Update documentation

## v1.6.8 (UNRELEASED)
## v1.6.8

- Enterprise task changes
- Add `vault_install_remotely` docs
- Add `vault_remote_tmp` variable and use it
- Rename `cluster_nodes` label to `vault_instances`
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ The role defines variables in `defaults/main.yml`:
### `vault_group_name`

- Inventory group name
- Default value: `cluster_nodes`
- Default value: `vault_instances`

### `vault_cluster_name`

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ vault_manage_group: no
vault_group: bin

### Vault settings
vault_group_name: cluster_nodes
vault_group_name: vault_instances
vault_cluster_name: dc1
vault_datacenter: dc1
vault_log_level: "{{ lookup('env','VAULT_LOG_LEVEL') | default('info', true) }}"
Expand Down
4 changes: 2 additions & 2 deletions examples/site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# File: site.yml - Example Vault site playbook

- Group nodes
hosts: cluster_nodes
hosts: vault_instances
become: yes
become_user: root
tasks:
- name: Create cluster grouping
group_by: key={{ couchbase_server_node_role }}

- name: Install Vault
hosts: cluster_nodes
hosts: vault_instances
any_errors_fatal: true
become: yes
become_user: root
Expand Down
2 changes: 1 addition & 1 deletion examples/vagrant_hosts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# the 'nodeN' pattern for additional nodes past 'vault3'
# Do not modify the labels (text appearing between []), however

[cluster_nodes]
[vault_instances]
vault1.local ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/vault1/virtualbox/private_key

vault1.local ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/vault1/virtualbox/private_key
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.6.7
v1.6.8

0 comments on commit b431b4d

Please sign in to comment.