From 5239e69e338ff1b9293ee97ebe2ce6a05be13671 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Fri, 25 Oct 2019 15:29:01 -0400 Subject: [PATCH] e2e: refactor Vault configuration (#6561) Match the configuration directory layout we're using for Consul and other services. Make recommended changes from `shellcheck` for this section of the provisioning script. --- e2e/terraform/shared/config/provision-client.sh | 1 - e2e/terraform/shared/config/provision-server.sh | 8 +++++--- e2e/terraform/shared/{config => vault}/vault.hcl | 0 e2e/terraform/shared/{config => vault}/vault.service | 0 4 files changed, 5 insertions(+), 4 deletions(-) rename e2e/terraform/shared/{config => vault}/vault.hcl (100%) rename e2e/terraform/shared/{config => vault}/vault.service (100%) diff --git a/e2e/terraform/shared/config/provision-client.sh b/e2e/terraform/shared/config/provision-client.sh index 38f843e15..0b7ca1361 100755 --- a/e2e/terraform/shared/config/provision-client.sh +++ b/e2e/terraform/shared/config/provision-client.sh @@ -46,7 +46,6 @@ sudo chown -R $HOME_DIR:$HOME_DIR /home/$HOME_DIR/examples sudo chmod -R 775 /home/$HOME_DIR/examples # Set env vars for tool CLIs -echo "export VAULT_ADDR=http://$IP_ADDRESS:8200" | sudo tee --append /home/$HOME_DIR/.bashrc echo "export NOMAD_ADDR=http://$IP_ADDRESS:4646" | sudo tee --append /home/$HOME_DIR/.bashrc echo "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre" | sudo tee --append /home/$HOME_DIR/.bashrc diff --git a/e2e/terraform/shared/config/provision-server.sh b/e2e/terraform/shared/config/provision-server.sh index 6a07bef00..c275d4fde 100755 --- a/e2e/terraform/shared/config/provision-server.sh +++ b/e2e/terraform/shared/config/provision-server.sh @@ -6,7 +6,6 @@ set -o nounset CONFIGDIR=/ops/shared/config CONSULCONFIGDIR=/etc/consul.d -VAULTCONFIGDIR=/etc/vault.d NOMADCONFIGDIR=/etc/nomad.d HADOOP_VERSION=hadoop-2.7.7 HADOOPCONFIGDIR=/usr/local/$HADOOP_VERSION/etc/hadoop @@ -33,8 +32,11 @@ export CONSUL_HTTP_ADDR=$IP_ADDRESS:8500 export CONSUL_RPC_ADDR=$IP_ADDRESS:8400 # Vault -sudo cp $CONFIGDIR/vault.hcl $VAULTCONFIGDIR -sudo cp $CONFIGDIR/vault.service /etc/systemd/system/vault.service +VAULT_SRC=/ops/shared/vault +VAULT_DEST=/etc/vault.d + +sudo cp "$VAULT_SRC/vault.hcl" "$VAULT_DEST" +sudo cp "$VAULT_SRC/vault.service" /etc/systemd/system/vault.service sudo systemctl enable vault.service sudo systemctl start vault.service diff --git a/e2e/terraform/shared/config/vault.hcl b/e2e/terraform/shared/vault/vault.hcl similarity index 100% rename from e2e/terraform/shared/config/vault.hcl rename to e2e/terraform/shared/vault/vault.hcl diff --git a/e2e/terraform/shared/config/vault.service b/e2e/terraform/shared/vault/vault.service similarity index 100% rename from e2e/terraform/shared/config/vault.service rename to e2e/terraform/shared/vault/vault.service