Merge branch 'pin_ohai_and_zero' into 'master'

Pin ohai and zero

Fixes #1242

See merge request !756

config/projects/gitlab.rb

@@ -64,6 +64,8 @@ dependency "package-scripts"
 dependency "git"
 dependency "redis"
 dependency "nginx"
+dependency "chef-zero"
+dependency "ohai"
 dependency "chef-gem"
 dependency "remote-syslog" if ee
 dependency "logrotate"

config/software/chef-zero.rb

@@ -0,0 +1,35 @@
+#
+# Copyright 2016 GitLab Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# We are pinning chef-zero because version 4.6.0 intorduced very verbose
+# output in info log level.
+# Introduced by https://github.com/chef/chef-zero/pull/199
+# When changing this version, make sure that the verbosity went down.
+
+name "chef-zero"
+default_version "4.5.0"
+
+dependency "ruby"
+dependency "rubygems"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+
+  gem "install chef-zero" \
+      " --version '#{version}'" \
+      " --bindir '#{install_dir}/embedded/bin'" \
+      " --no-ri --no-rdoc", env: env
+end

config/software/ohai.rb

@@ -0,0 +1,30 @@
+#
+# Copyright 2016 GitLab Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name "ohai"
+default_version "8.15.1"
+
+dependency "ruby"
+dependency "rubygems"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+
+  gem "install ohai" \
+      " --version '#{version}'" \
+      " --bindir '#{install_dir}/embedded/bin'" \
+      " --no-ri --no-rdoc", env: env
+end