From f2952181fe2f8a9b724fc11242f1dbc187096e67 Mon Sep 17 00:00:00 2001
From: Scott Lowe <scott.lowe@scottlowe.org>
Date: Tue, 23 May 2017 15:04:03 -0600
Subject: [PATCH] Clean up .gitignore files

Remove extraneous .gitignore files, add definitions to main .gitignore file in the root of the repository

Signed-off-by: Scott Lowe <scott.lowe@scottlowe.org>
---
 .gitignore                           | 5 ++++-
 docker/swarm-etcd/.gitignore         | 2 --
 docker/swarm-etcd2-photon/.gitignore | 2 --
 etcd/etcd-2.0/.gitignore             | 2 --
 terraform/aws/.gitignore             | 2 --
 5 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 docker/swarm-etcd/.gitignore
 delete mode 100644 docker/swarm-etcd2-photon/.gitignore
 delete mode 100644 etcd/etcd-2.0/.gitignore
 delete mode 100644 terraform/aws/.gitignore

diff --git a/.gitignore b/.gitignore
index e063d5d..3b1acce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,8 @@
 .vagrant
 real-adminrc
 *.taskpaper
-terraform/tf-example/terraform.tfstate*
+*.tfstate
+*.tfstate.backup
+*.tfvars
 consul-*.config.json
+*.defaults
diff --git a/docker/swarm-etcd/.gitignore b/docker/swarm-etcd/.gitignore
deleted file mode 100644
index 277ea56..0000000
--- a/docker/swarm-etcd/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-*.defaults
diff --git a/docker/swarm-etcd2-photon/.gitignore b/docker/swarm-etcd2-photon/.gitignore
deleted file mode 100644
index 277ea56..0000000
--- a/docker/swarm-etcd2-photon/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-*.defaults
diff --git a/etcd/etcd-2.0/.gitignore b/etcd/etcd-2.0/.gitignore
deleted file mode 100644
index 277ea56..0000000
--- a/etcd/etcd-2.0/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-*.defaults
diff --git a/terraform/aws/.gitignore b/terraform/aws/.gitignore
deleted file mode 100644
index e2bf8bc..0000000
--- a/terraform/aws/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.tfstate
-*.tfstate.backup