Merge "Drop deprecated templates/Makefile/merge.py"

[apex-tripleo-heat-templates.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 06513ac..6996d50 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,8 @@ overcloud-with-block-storage.yaml
 overcloud-with-block-storage-nfs.yaml
 undercloud-bm.yaml
 undercloud-vm.yaml
-undercloud-vm-tuskar.yaml
 undercloud-vm-ironic.yaml
+undercloud-vm-ironic-vlan.yaml
 
 *.py[cod]
 
@@ -45,6 +45,8 @@ nosetests.xml
 
 *~
 *.swp
+*.bundle
+Gemfile.lock
 
 doc/_build