master: moving beer table creation into demo scripts

grove-mountain · Apr 4, 2019 · c1e537a · c1e537a
1 parent b135772
commit c1e537a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/vault/azure_secret_sprawl_webinar/1_azure_dyn_db.sh b/vault/azure_secret_sprawl_webinar/1_azure_dyn_db.sh
@@ -1,9 +1,23 @@
 . env.sh
 
-green "Enable the Azure auth method"
-pe "vault auth enable azure"
+green "Create the source table used in the examples below"
 
+cat << EOF
+mysql -h \${MYSQL_HOST_FULL}
+      -D \${MYSQL_DATABASE}
+      -u \${MYSQL_VAULT_USER}@\${MYSQL_HOST}
+      --password=\${MYSQL_VAULT_PASSWORD} < ~/hc-demos/vault/azure_secret_sprawl_webinar/terraform/files/create_beer_table.sql
+EOF
+p
 
+mysql -h ${MYSQL_HOST_FULL} \
+      -D ${MYSQL_DATABASE} \
+      -u ${MYSQL_VAULT_USER}@${MYSQL_HOST} \
+      --password=${MYSQL_VAULT_PASSWORD} < ~/hc-demos/vault/azure_secret_sprawl_webinar/terraform/files/create_beer_table.sql
+
+
+green "Enable the Azure auth method"
+pe "vault auth enable azure"
 
 green "Azure auth needs a service principle to actually verify logins from other service principles"
 cat << EOF

diff --git a/vault/azure_secret_sprawl_webinar/terraform/files/setup.sh b/vault/azure_secret_sprawl_webinar/terraform/files/setup.sh
@@ -45,6 +45,3 @@ echo "Vault installation complete."
 
 echo "Installing code repo for demo"
 git clone https://github.com/grove-mountain/hc-demos.git
-export MYSQL_HOST_FULL=${MYSQL_HOST}.mysql.database.azure.com
-
-mysql -h ${MYSQL_HOST_FULL} -D ${MYSQL_DATABASE} -u ${MYSQL_VAULT_USER}@${MYSQL_HOST} --password=${MYSQL_VAULT_PASSWORD} < hc-demos/vault/azure_secret_sprawl_webinar/terraform/files/create_beer_table.sql