diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-28 10:36:38 -0500 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-02-04 21:37:12 -0500 |
| commit | cdc1842693c6d5ac4d8e0f5b51e4e656173d367e (patch) | |
| tree | 3a7b80e06e89d287d66640169dbb7c3105d10f51 | |
| parent | 3079e7bbcb13780322c9748876392f1ebad20447 (diff) | |
| download | chef-cdc1842693c6d5ac4d8e0f5b51e4e656173d367e.tar.gz | |
Use franken-ruby on windows FIPS builds
| -rw-r--r-- | omnibus/.kitchen.yml | 7 | ||||
| -rw-r--r-- | omnibus/config/projects/chef-fips.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml index 7ca0af7f25..fa3e8c85ce 100644 --- a/omnibus/.kitchen.yml +++ b/omnibus/.kitchen.yml @@ -102,6 +102,13 @@ suites: install_dir: /opt/angrychef run_list: - omnibus::default + - name: chef-fips + attributes: + omnibus: + <<: *attribute_defaults + install_dir: /opt/chef-fips + run_list: + - omnibus::default - name: chef provisioner: chef_omnibus_install_options: -P angrychef diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb index be059f332c..8f65efc383 100644 --- a/omnibus/config/projects/chef-fips.rb +++ b/omnibus/config/projects/chef-fips.rb @@ -34,7 +34,7 @@ else install_dir "#{default_root}/#{name}" end -override :'ruby-windows', version: "2.0.0-p647" +override :ruby, version: "2.1.7" # Global FIPS override flag. override :fips, enabled: true |