From 2cc46b8655826cbbc0b8c255fe1dbb1bbfd1dab7 Mon Sep 17 00:00:00 2001
From: Jay Carlson <nop@nop.com>
Date: Sat, 23 Mar 2019 17:12:33 -0400
Subject: [PATCH] Rename vars.yml (#1536)

* Checkpoint

* Turning off the library works
---
 Vagrantfile                               | 2 +-
 deploy/streisand-existing-cloud-server.sh | 2 +-
 deploy/streisand-local.sh                 | 2 +-
 deploy/streisand-new-cloud-server.sh      | 2 +-
 global_vars/{vars.yml => globals.yml}     | 0
 playbooks/validate.yml                    | 2 +-
 streisand                                 | 2 +-
 tests/tests.sh                            | 2 +-
 util/source_validate_and_deploy.sh        | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename global_vars/{vars.yml => globals.yml} (100%)

diff --git a/Vagrantfile b/Vagrantfile
index 0472ed541..920a8da22 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -20,7 +20,7 @@ Vagrant.configure(2) do |config|
         }
       }
       ansible.raw_arguments  = [
-        "--extra-vars=@global_vars/vars.yml",
+        "--extra-vars=@global_vars/globals.yml",
         "--extra-vars=@global_vars/default-site.yml",
         "--extra-vars=@global_vars/integration/test-site.yml"
       ]
diff --git a/deploy/streisand-existing-cloud-server.sh b/deploy/streisand-existing-cloud-server.sh
index f7917d9a2..e27926129 100755
--- a/deploy/streisand-existing-cloud-server.sh
+++ b/deploy/streisand-existing-cloud-server.sh
@@ -22,7 +22,7 @@ DIR="$( cd "$( dirname "$0" )" && pwd)"
 PROJECT_DIR="${DIR}/.."
 
 export DEFAULT_SITE_VARS="${PROJECT_DIR}/global_vars/default-site.yml"
-export GLOBAL_VARS="${PROJECT_DIR}/global_vars/vars.yml"
+export GLOBAL_VARS="${PROJECT_DIR}/global_vars/globals.yml"
 
 # Include the check_ansible function from ansible_check.sh.
 # shellcheck source=util/source_validate_and_deploy.sh
diff --git a/deploy/streisand-local.sh b/deploy/streisand-local.sh
index 232195e71..4ba80c8bf 100755
--- a/deploy/streisand-local.sh
+++ b/deploy/streisand-local.sh
@@ -19,7 +19,7 @@ DIR="$( cd "$( dirname "$0" )" && pwd)"
 PROJECT_DIR="${DIR}/.."
 
 export DEFAULT_SITE_VARS="${PROJECT_DIR}/global_vars/default-site.yml"
-export GLOBAL_VARS="${PROJECT_DIR}/global_vars/vars.yml"
+export GLOBAL_VARS="${PROJECT_DIR}/global_vars/globals.yml"
 
 # Include the check_ansible function from ansible_check.sh.
 # shellcheck source=util/source_validate_and_deploy.sh
diff --git a/deploy/streisand-new-cloud-server.sh b/deploy/streisand-new-cloud-server.sh
index a2f54d8c6..d6b6be4f0 100755
--- a/deploy/streisand-new-cloud-server.sh
+++ b/deploy/streisand-new-cloud-server.sh
@@ -21,7 +21,7 @@ PROJECT_DIR="${DIR}/.."
 
 VALID_PROVIDERS="amazon|azure|digitalocean|google|linode|rackspace"
 export DEFAULT_SITE_VARS="${PROJECT_DIR}/global_vars/default-site.yml"
-export GLOBAL_VARS="${PROJECT_DIR}/global_vars/vars.yml"
+export GLOBAL_VARS="${PROJECT_DIR}/global_vars/globals.yml"
 
 # Include the check_ansible function from ansible_check.sh.
 # shellcheck source=util/source_validate_and_deploy.sh
diff --git a/global_vars/vars.yml b/global_vars/globals.yml
similarity index 100%
rename from global_vars/vars.yml
rename to global_vars/globals.yml
diff --git a/playbooks/validate.yml b/playbooks/validate.yml
index b2e063211..b46d9ba9b 100644
--- a/playbooks/validate.yml
+++ b/playbooks/validate.yml
@@ -6,7 +6,7 @@
   gather_facts: no
 
   vars_files:
-    - ../global_vars/vars.yml
+    - ../global_vars/globals.yml
 
   roles:
     - validation
diff --git a/streisand b/streisand
index e058d2e73..d96c5e36a 100755
--- a/streisand
+++ b/streisand
@@ -13,7 +13,7 @@ export ANSIBLE_LIBRARY=
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 
 DEFAULT_SITE_VARS="$SCRIPT_DIR/global_vars/default-site.yml"
-GLOBAL_VARS="$SCRIPT_DIR/global_vars/vars.yml"
+GLOBAL_VARS="$SCRIPT_DIR/global_vars/globals.yml"
 HOME_DIR="$HOME/.streisand"
 SITE_VARS="$HOME_DIR/site.yml"
 
diff --git a/tests/tests.sh b/tests/tests.sh
index f28f3a976..622efb1be 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -35,7 +35,7 @@ function run_playbook {
 
   ansible-playbook \
     -i "$DIR/inventory" \
-    --extra-vars=@global_vars/vars.yml \
+    --extra-vars=@global_vars/globals.yml \
     $SITE_DECL \
     "$PLAYBOOK" "${EXTRA_FLAGS[@]}"
 }
diff --git a/util/source_validate_and_deploy.sh b/util/source_validate_and_deploy.sh
index 9540ac35f..25526de50 100644
--- a/util/source_validate_and_deploy.sh
+++ b/util/source_validate_and_deploy.sh
@@ -4,7 +4,7 @@
 # codebase. It expects the following variables set:
 #
 # DEFAULT_SITE_VARS /path/to/default-site.yml
-# GLOBAL_VARS /path/to/vars.yml
+# GLOBAL_VARS /path/to/globals.yml
 # INVENTORY /path/to/inventory
 # PROJECT_DIR /path/to/streisand
 # SITE_VARS /path/to/site.yml