Page MenuHomePhabricator
Files F13694028

Masterwork From Distant Lands
No One
Actions

Authored By
• Mattflaschen-WMF
Feb 13 2018, 2:12 AM
Size
5 KB
Referenced Files
None
Subscribers
None

Masterwork From Distant Lands
View Options

diff --git a/Vagrantfile b/Vagrantfile
index 68afaa4..c925df2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -219,71 +219,71 @@ Vagrant.configure('2') do |config|
# Ensure that the VM has Puppet installed
config.vm.provision :shell, path: 'support/puppet-bootstrap.sh'
- config.vm.provision :puppet do |puppet|
- # Use empty module path to avoid an extra mount.
- # See --modulepath below
- puppet.module_path = []
-
- # Tell Vagrant that the manifests are already on the guest
- puppet.manifests_path = [:guest, '/vagrant/puppet/manifests']
- puppet.manifest_file = 'site.pp'
-
- puppet.environment_path = [:guest, '/vagrant/puppet/environments']
- puppet.environment = 'vagrant'
-
- puppet.options = [
- '--modulepath', '/vagrant/puppet/modules',
- '--hiera_config', '/vagrant/puppet/hiera.yaml',
- '--verbose',
- '--config_version', '/vagrant/puppet/extra/config-version',
- '--logdest', "/vagrant/logs/puppet/puppet.#{mwv.commit || 'unknown'}.log",
- '--logdest', 'console',
- '--write-catalog-summary',
- '--detailed-exitcodes',
- '--ordering manifest',
- ]
-
- # Handy debugging commands for Puppet runs
- puppet.options << '--evaltrace' if ENV.include?('PUPPET_EVAL_TRACE')
- puppet.options << '--debug' if ENV.include?('PUPPET_DEBUG')
-
- # Windows's Command Prompt has poor support for ANSI escape sequences.
- puppet.options << '--color=false' if Vagrant::Util::Platform.windows?
-
- puppet.facter = {
- 'fqdn' => config.vm.hostname,
- 'git_user' => settings[:git_user],
- 'forwarded_port' => settings[:http_port],
- 'forwarded_https_port' => settings[:https_port],
- 'shared_apt_cache' => '/vagrant/cache/apt/',
- 'environment' => ENV['MWV_ENVIRONMENT'] || 'vagrant',
- 'vmhost' => Socket.gethostname,
- # T86282: Force Puppet's LANG env var by exploiting a factor quirk.
- # See https://stackoverflow.com/a/23502693/582542
- 'x=x LANG=en_US.UTF-8 x' => 'x',
- }
-
- if settings[:http_port] != 80 && ENV['MWV_ENVIRONMENT'] != 'labs'
- puppet.facter['port_fragment'] = ":#{settings[:http_port]}"
- else
- puppet.facter['port_fragment'] = ''
- end
-
- if settings[:nfs_shares]
- puppet.facter['share_owner'] = Process.uid
- puppet.facter['share_group'] = Process.gid
- else
- puppet.facter['share_owner'] = 'vagrant'
- puppet.facter['share_group'] = 'www-data'
- end
-
- # Derive a host IP from the configured static IP by getting the first
- # usable IP in the 8-bit network
- if settings[:static_ip]
- network = IPAddr.new("#{settings[:static_ip]}/24")
- puppet.facter['host_ip'] = network.to_range.take(2).last.to_s
- end
- end
+# config.vm.provision :puppet do |puppet|
+# # Use empty module path to avoid an extra mount.
+# # See --modulepath below
+# puppet.module_path = []
+
+# # Tell Vagrant that the manifests are already on the guest
+# puppet.manifests_path = [:guest, '/vagrant/puppet/manifests']
+# puppet.manifest_file = 'site.pp'
+
+# puppet.environment_path = [:guest, '/vagrant/puppet/environments']
+# puppet.environment = 'vagrant'
+
+# puppet.options = [
+# '--modulepath', '/vagrant/puppet/modules',
+# '--hiera_config', '/vagrant/puppet/hiera.yaml',
+# '--verbose',
+# '--config_version', '/vagrant/puppet/extra/config-version',
+# '--logdest', "/vagrant/logs/puppet/puppet.#{mwv.commit || 'unknown'}.log",
+# '--logdest', 'console',
+# '--write-catalog-summary',
+# '--detailed-exitcodes',
+# '--ordering manifest',
+# ]
+
+# # Handy debugging commands for Puppet runs
+# puppet.options << '--evaltrace' if ENV.include?('PUPPET_EVAL_TRACE')
+# puppet.options << '--debug' if ENV.include?('PUPPET_DEBUG')
+
+# # Windows's Command Prompt has poor support for ANSI escape sequences.
+# puppet.options << '--color=false' if Vagrant::Util::Platform.windows?
+
+# puppet.facter = {
+# 'fqdn' => config.vm.hostname,
+# 'git_user' => settings[:git_user],
+# 'forwarded_port' => settings[:http_port],
+# 'forwarded_https_port' => settings[:https_port],
+# 'shared_apt_cache' => '/vagrant/cache/apt/',
+# 'environment' => ENV['MWV_ENVIRONMENT'] || 'vagrant',
+# 'vmhost' => Socket.gethostname,
+# # T86282: Force Puppet's LANG env var by exploiting a factor quirk.
+# # See https://stackoverflow.com/a/23502693/582542
+# 'x=x LANG=en_US.UTF-8 x' => 'x',
+# }
+
+# if settings[:http_port] != 80 && ENV['MWV_ENVIRONMENT'] != 'labs'
+# puppet.facter['port_fragment'] = ":#{settings[:http_port]}"
+# else
+# puppet.facter['port_fragment'] = ''
+# end
+
+# if settings[:nfs_shares]
+# puppet.facter['share_owner'] = Process.uid
+# puppet.facter['share_group'] = Process.gid
+# else
+# puppet.facter['share_owner'] = 'vagrant'
+# puppet.facter['share_group'] = 'www-data'
+# end
+
+# # Derive a host IP from the configured static IP by getting the first
+# # usable IP in the 8-bit network
+# if settings[:static_ip]
+# network = IPAddr.new("#{settings[:static_ip]}/24")
+# puppet.facter['host_ip'] = network.to_range.take(2).last.to_s
+# end
+# end
end
# Load custom Vagrantfile overrides from 'Vagrantfile-extra.rb'

File Metadata

Mime Type
text/plain; charset=utf-8
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5514839
Default Alt Text
Masterwork From Distant Lands (5 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits