Skip to content
Snippets Groups Projects
Commit 8fbd05fe authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'minimal_ohai' into 'master'

Update the syntax for ohai disabled_plugins and specify correct log_level.



See merge request !623
parents 8115cae4 0fa4e42f
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,7 @@
verbose_logging false
ssl_verify_mode :verify_peer
log_location "/var/log/gitlab/reconfigure/#{TIME}.log"
log_level :info
# Omnibus-GitLab only needs to know very little about the system it is running
# on. We want to disable as many Ohai plugins as we can to avoid plugin bugs
# and speed up 'gitlab-ctl reconfigure'.
......@@ -13,5 +14,5 @@
# The list below, based on Ohai 7.4.1, is a blacklist. UNcomment a plugin to
# disable it. For example, ':Groovy,' is uncommented because omnibus-gitlab
# does not care about Groovy.
Ohai::Config[:disabled_plugins] = [
ohai.disabled_plugins = [
:Azure,
......@@ -17,4 +18,3 @@
:Azure,
#:Chef,
:Cloud,
:CloudV2,
......@@ -19,7 +19,6 @@
:Cloud,
:CloudV2,
#:Command,
#:C,
#:DMI,
:DMI,
:DigitalOcean,
:EC2,
:Erlang,
......@@ -24,5 +23,6 @@
:EC2,
:Erlang,
:Elixir,
:Eucalyptus,
:GCE,
:Groovy,
......@@ -26,8 +26,6 @@
:Eucalyptus,
:GCE,
:Groovy,
#:Hostname,
#:InitPackage,
#:IpScopes,
:Go,
:Java,
:Joyent,
......@@ -32,8 +30,5 @@
:Java,
:Joyent,
#:Kernel,
#:Keys,
#:Languages,
:Linode,
:Lua,
:Mono,
......@@ -37,6 +32,6 @@
:Linode,
:Lua,
:Mono,
#:NetworkListeners,
#:NetworkAddresses,
:NetworkListeners,
:NetworkRoutes,
:Nodejs,
......@@ -42,4 +37,2 @@
:Nodejs,
#:Ohai,
#:OhaiTime,
:Openstack,
......@@ -45,5 +38,3 @@
:Openstack,
#:OS,
#:Passwd,
#:Perl,
:Perl,
:PHP,
......@@ -49,3 +40,2 @@
:PHP,
#:Platform,
:Powershell,
......@@ -51,69 +41,10 @@
:Powershell,
#:PS,
#:Python,
#:Rackspace,
#:RootGroup,
#:Ruby,
#:SSHHostKey,
#:Uptime,
#:VirtualizationInfo,
#:CPU,
#:Filesystem,
#:Kernel,
#:Memory,
#:Network,
#:Platform,
#:Uptime,
#:CPU,
#:Filesystem,
#:Memory,
#:Network,
#:Platform,
#:SystemProfile,
#:CPU,
#:Filesystem,
#:Memory,
#:Network,
#:OS,
#:Platform,
#:Virtualization,
#:BlockDevice,
#:CPU,
#:Filesystem,
#:LSB,
#:Mdadm,
#:Memory,
#:Network,
#:Platform,
#:Virtualization,
#:CPU,
#:Filesystem,
#:Memory,
#:Network,
#:Platform,
#:Virtualization,
#:CPU,
#:Filesystem,
#:Memory,
#:Network,
#:Platform,
#:Virtualization,
#:CPU,
#:Filesystem,
#:Memory,
#:Network,
#:NetworkRoutes,
#:Platform,
#:CPU,
#:DMI,
#:Filesystem,
#:Memory,
#:Network,
#:Platform,
#:Virtualization,
#:Zpools,
#:CPU,
#:Filesystem,
#:Network,
#:Platform,
:Python,
:Rackspace,
:Rust,
:Virtualbox,
:VMware,
:SystemProfile,
:Zpools,
:Virtualization
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment