diff --git a/.gitignore b/.gitignore
index 2120b78f23..801b7e1110 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,10 @@ pep8.txt
 tools/vagrant/local.yml
 .vagrant*
 
+# Setup
+setup/tower_setup_conf.yml
+setup/setup.log
+
 # Other
 .tower_cycle
 env/*