BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202989
Change subject: Remove unused puppet/files and puppet/templates
......................................................................
Remove unused puppet/files and puppet/templates
All the goodies are in modules now!
Change-Id: I5c13ab2d91af950bbf2aacd9e752720f51b549dd
---
M Vagrantfile
M lib/labs-vagrant.rb
D puppet/files/.gitignore
D puppet/files/apt/wikimedia-precise.list
D puppet/templates/.gitignore
5 files changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/89/202989/1
diff --git a/Vagrantfile b/Vagrantfile
index 9f83a51..c7851d2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -198,7 +198,6 @@
'--templatedir', '/vagrant/puppet/templates',
'--verbose',
'--config_version', '/vagrant/puppet/extra/config-version',
- '--fileserverconfig', '/vagrant/puppet/extra/fileserver.conf',
'--logdest', "/vagrant/logs/puppet/puppet.#{mwv.commit ||
'unknown'}.log",
'--logdest', 'console',
'--write-catalog-summary',
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index 327f8bc..ba0bac2 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -74,7 +74,6 @@
--modulepath #{puppet_path}/modules \
--manifestdir #{puppet_path}/manifests \
--templatedir #{puppet_path}/templates \
- --fileserverconfig #{puppet_path}/extra/fileserver.conf \
--config_version #{puppet_path}/extra/config-version \
--hiera_config #{puppet_path}/hiera.yaml \
--verbose \
diff --git a/puppet/files/.gitignore b/puppet/files/.gitignore
deleted file mode 100644
index d3c2f59..0000000
--- a/puppet/files/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# .gitignore
diff --git a/puppet/files/apt/wikimedia-precise.list
b/puppet/files/apt/wikimedia-precise.list
deleted file mode 100644
index dd5fb0e..0000000
--- a/puppet/files/apt/wikimedia-precise.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include precise packages so that CDH can be installed in Trusty.
-# This file is managed by Puppet.
-#
-deb http://apt.wikimedia.org/wikimedia precise-wikimedia main universe
-deb-src http://apt.wikimedia.org/wikimedia precise-wikimedia main universe
diff --git a/puppet/templates/.gitignore b/puppet/templates/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/puppet/templates/.gitignore
+++ /dev/null
--
To view, visit https://gerrit.wikimedia.org/r/202989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c13ab2d91af950bbf2aacd9e752720f51b549dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
