Skip to content

Commit

Permalink
backport of commit 460b5de (#23358)
Browse files Browse the repository at this point in the history
Co-authored-by: Ryan Cragun <[email protected]>
  • Loading branch information
1 parent 17b0ff8 commit b583bab
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
13 changes: 11 additions & 2 deletions enos/enos-scenario-replication.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,12 @@ scenario "replication" {
}

step "get_primary_cluster_ips" {
module = module.vault_get_cluster_ips
depends_on = [step.verify_that_vault_primary_cluster_is_unsealed]
module = module.vault_get_cluster_ips
depends_on = [
step.verify_vault_version,
step.verify_ui,
step.verify_that_vault_primary_cluster_is_unsealed,
]

providers = {
enos = local.enos_provider[matrix.distro]
Expand Down Expand Up @@ -802,6 +806,11 @@ scenario "replication" {
value = step.create_secondary_cluster_targets.hosts
}

output "secondary_cluster_root_token" {
description = "The Vault secondary cluster root token"
value = step.create_secondary_cluster.root_token
}

output "remaining_hosts" {
description = "The Vault cluster primary hosts after removing the leader and follower"
value = step.get_remaining_hosts_replication_data.remaining_hosts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ binpath=${VAULT_INSTALL_DIR}/vault
test -x "$binpath" || fail "Unable to locate vault binary at $binpath"

count=0
retries=5
retries=10
while :; do
# Vault >= 1.10.x has the operator members. If we have that then we'll use it.
if $binpath operator -h 2>&1 | grep members &> /dev/null; then
Expand Down

0 comments on commit b583bab

Please sign in to comment.