Allow chef software definition to fetch locally or from github

2 files changed, 12 insertions, 3 deletions

diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index c1d1dd2c40..eb04a05ed9 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -53,7 +53,6 @@ else
 end
 
 # Chef Release version pinning
-override :chef, version: 'master'
 override :ohai, version: 'master'
 
 
diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb
index 9a2e86db4c..5d42f71d23 100644
--- a/omnibus/config/software/chef.rb
+++ b/omnibus/config/software/chef.rb
@@ -14,12 +14,22 @@
 # limitations under the License.
 #
 name "chef"
-default_version "master"
+default_version "local_source"
 
-source path: "#{project.files_path}/../.."
+# For the specific super-special version "local_source", build the source from
+# the local git checkout. This is what you'd want to occur by default if you
+# just ran omnibus build locally.
+version("local_source") { source path: "#{project.files_path}/../.." }
 #TODO: Check if I need to exclude any current omnibus generated files.
 # options: {:exclude => [some paths]}
 
+# For any version other than "local_source", fetch from github.
+# This is the behavior the transitive omnibus software deps such as chef-dk
+# expect.
+if version != "local_source"
+  source git: "git://github.com/chef/chef"
+end
+
 relative_path "chef"
 
 fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false