Merge pull request #1215 from chef/mp/post-12.14-upgrades

post 12.14 upgrades

omnibus/Berksfile.lock

@@ -5,28 +5,23 @@ DEPENDENCIES
 
 GRAPH
   apt (2.9.2)
-  build-essential (7.0.3)
-    compat_resource (>= 12.16.3)
+  build-essential (8.0.0)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-ingredient (0.21.2)
-    compat_resource (>= 12.10)
+  chef-ingredient (2.0.1)
   chef-sugar (3.4.0)
-  compat_resource (12.16.3)
   dmg (3.1.0)
-  git (5.0.2)
+  git (6.0.0)
     build-essential (>= 0.0.0)
     dmg (>= 0.0.0)
     yum-epel (>= 0.0.0)
   homebrew (3.0.0)
-  mingw (1.2.5)
-    compat_resource (>= 12.16.3)
+  mingw (2.0.0)
     seven_zip (>= 0.0.0)
-  ohai (4.2.3)
-    compat_resource (>= 12.14.7)
-  omnibus (5.0.0)
+  ohai (5.0.2)
+  omnibus (5.1.6)
     build-essential (>= 6.0.0)
-    chef-ingredient (>= 0.18.0)
+    chef-ingredient (>= 0.21.4)
     chef-sugar (>= 3.2.0)
     git (>= 0.0.0)
     homebrew (>= 0.0.0)
@@ -38,11 +33,11 @@ GRAPH
   remote_install (1.0.2)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
-  windows (2.1.1)
+  windows (3.0.4)
     ohai (>= 4.0.0)
   windows-sdk (1.0.2)
-  wix (3.0.0)
-    windows (>= 1.38.2)
-  yum (4.1.0)
+  wix (3.2.0)
+    windows (>= 2.0)
+  yum (5.0.0)
   yum-epel (0.7.1)
     yum (>= 3.6.3)

omnibus/Gemfile.lock

@@ -1,14 +1,14 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: 2cf81860f92d4f2df4444341048b8aeec2da0cfa
+  revision: ff3cb28159e72414d63008f9a0d42e85d4aec4ba
   specs:
-    license_scout (0.1.2)
+    license_scout (0.1.3)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 76d907f4fe92a28c5f7ab11779341e1d773c358d
+  revision: 433220e0b7c434dbc4a36daaa1fecbdb1bf7231d
   specs:
     omnibus (5.5.0)
       aws-sdk (~> 2)
@@ -19,12 +19,13 @@ GIT
       mixlib-shellout (~> 2.0)
       mixlib-versioning
       ohai (~> 8.0)
+      pedump
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: a6f5d260b34c5a19fb2ef873ab3216c7bab0ef6f
+  revision: 1aceb81a5e91b96401010292f22263820d082811
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -33,22 +34,23 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    aws-sdk (2.8.2)
-      aws-sdk-resources (= 2.8.2)
-    aws-sdk-core (2.8.2)
+    awesome_print (1.7.0)
+    aws-sdk (2.9.2)
+      aws-sdk-resources (= 2.9.2)
+    aws-sdk-core (2.9.2)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.8.2)
-      aws-sdk-core (= 2.8.2)
+    aws-sdk-resources (2.9.2)
+      aws-sdk-core (= 2.9.2)
     aws-sigv4 (1.0.0)
-    berkshelf (5.3.0)
+    berkshelf (5.6.4)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -58,7 +60,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
-      mixlib-archive (~> 0.1)
+      mixlib-archive (~> 0.4)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
@@ -82,25 +84,25 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.17.44)
+    chef (12.19.36)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.17.44)
+      chef-config (= 12.19.36)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
-      mixlib-archive (>= 0.2.0)
+      mixlib-archive (~> 0.4)
       mixlib-authentication (~> 1.4)
       mixlib-cli (~> 1.7)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-multi (~> 1.1)
-      ohai (>= 8.6.0.alpha.1, < 9)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (>= 8.6.0.alpha.1, < 13)
       plist (~> 3.2)
       proxifier (~> 1.0)
       rspec-core (~> 3.5)
@@ -111,31 +113,31 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.17.44)
+    chef-config (12.19.36)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-sugar (3.4.0)
-    chef-zero (5.1.1)
+    chef-zero (13.0.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
       rack (~> 2.0)
       uuidtools (~> 2.1)
-    chefspec (5.3.0)
+    chefspec (6.2.0)
       chef (>= 12.0)
-      fauxhai (~> 3.6)
+      fauxhai (>= 3.6, < 5)
       rspec (~> 3.0)
     cleanroom (1.0.0)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    fauxhai (3.10.0)
+    fauxhai (4.1.0)
       net-ssh
     ffi (1.9.18)
     ffi-yajl (2.3.0)
@@ -149,19 +151,20 @@ GEM
       rainbow (>= 2.1)
       rake (>= 10.0)
       retriable (~> 2.1)
-    hashie (3.4.6)
+    hashie (3.5.5)
     highline (1.7.8)
     hitimes (1.2.4)
     httpclient (2.8.3)
-    i18n (0.8.0)
+    i18n (0.8.1)
     iniparse (1.4.2)
+    iostruct (0.0.4)
     ipaddress (0.8.3)
     jmespath (1.3.1)
     json (2.0.3)
     libyajl2 (1.2.0)
-    minitar (0.5.4)
+    minitar (0.6.1)
     minitest (5.10.1)
-    mixlib-archive (0.2.0)
+    mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
@@ -170,16 +173,16 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.5)
+    molinillo (0.5.7)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
+    net-ssh (4.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
@@ -199,7 +202,14 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    pedump (0.5.2)
+      awesome_print
+      iostruct (>= 0.0.4)
+      multipart-post (~> 2.0.0)
+      progressbar
+      zhexdump (>= 0.0.2)
     plist (3.2.0)
+    progressbar (1.8.2)
     proxifier (1.0.3)
     public_suffix (2.0.5)
     rack (2.0.1)
@@ -258,24 +268,25 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.66.5)
+    specinfra (2.67.7)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
     syslog-logger (1.6.8)
     systemu (2.6.5)
     thor (0.19.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     timers (4.0.4)
       hitimes
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uuidtools (2.1.5)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
     wmi-lite (1.0.0)
+    zhexdump (0.0.2)
 
 PLATFORMS
   ruby
@@ -292,4 +303,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

omnibus/config/projects/chef-server.rb

@@ -24,7 +24,7 @@
 replace         "private-chef"
 conflict        "private-chef"
 install_dir     "/opt/opscode"
-build_version   "12.14.0"
+build_version   "12.14.1"
 build_iteration 1
 #
 # Load dynamically updated overrides
@@ -34,66 +34,8 @@
 # creates required build directories
 dependency "preparation"
 
-# global
-dependency "private-chef-scripts" # assorted scripts used by installed instance
-dependency "private-chef-ctl" # additional project-specific private-chef-ctl subcommands
-dependency "ctl-man" # install man page
-dependency "openresty"
-dependency "rb-readline"
-dependency "redis-gem" # gem for interacting with redis
-dependency "openresty-lpeg"  # lua-based routing
-dependency "runit"
-dependency "chef_backup-gem" # chef-server-ctl backup
-dependency "veil-gem" # chef-server-ctl rotate-credentials
-dependency "erlang-crypto2"
+dependency "server-complete"
 
-# the backend
-dependency "postgresql92"
-dependency "rabbitmq"
-dependency "redis" # dynamic routing controls
-dependency "opscode-solr4"
-dependency "haproxy"
-dependency "opscode-expander"
-dependency "pg-gem" # used by private-chef-ctl reconfigure
-
-# Pull in knife-opc which is wrapped by chef-server-ctl to
-# allow user to create users and orgs, and handle org associations
-# without manage installed.
-dependency "knife-opc-gem"
-
-# download the gpg-key beforehand for rhel systems to
-# use when verifying add ons
-dependency "gpg-key"
-
-dependency "keepalived"
-dependency "bookshelf"
-
-# the front-end services
-dependency "oc_bifrost"
-dependency "oc_id"
-
-# log management
-dependency "logrotate"
-
-# partybus and upgrade scripts
-dependency "partybus"
-
-# used in osc to ec upgrade path
-dependency "knife-ec-backup-gem"
-
-# most frequently changed dependencies
-# by placing these deps at the end of the build, we can take
-# advantage of the git caching and increase build times
-# for situations where we're changing these components.
-# These are roughly sorted by build time and change frequency,
-# with the quickest builds coming last.
-dependency "opscode-chef-mover"
-dependency "oc_erchef"
-dependency "oc-chef-pedant"
-dependency "private-chef-upgrades"
-dependency "private-chef-cookbooks"
-dependency "chef-ha-plugin-config"
-dependency "chef" # for embedded chef-client -z runs (built from master - build last)
 dependency "cleanup" # MUST BE LAST DO NOT MOVE
 
 # if this is a release build, use a higher compression level

omnibus/config/software/oc_id.rb

@@ -20,7 +20,13 @@
 
 license "Apache-2.0"
 license_file "LICENSE"
-
+# We use the nokogiri gem in the project,
+# which pulls in libxml2.  On s390 the libxml2 lib is not built
+# at the time we're building oc_id, and so fails.
+# We add nokogiri as a dep because it's a direct dependency,
+# and makeds more sense than adding the thing that is stopping
+# it from building on s390 (libxml2).
+dependency "nokogiri"
 dependency "postgresql92" # for libpq
 dependency "nodejs-binary"
 dependency "ruby"