From 52970bdd451f6539fc4969fa0a54c89366cacdf6 Mon Sep 17 00:00:00 2001
From: Lance Albertson <lance@osuosl.org>
Date: Mon, 2 Dec 2019 17:26:59 -0800
Subject: [PATCH] Switch to using Chef 15

Change-Id: I3c981bfc19f39d869c5890e159431c50d5c97a5d
---
 Rakefile                       | 2 +-
 playbooks/pre-integration.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 473a3ae..4230284 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
 current_dir = File.dirname(__FILE__)
-client_opts = "--force-formatter --no-color -z --config #{current_dir}/.chef/knife.rb"
+client_opts = "--chef-license accept --force-formatter --no-color -z --config #{current_dir}/.chef/knife.rb"
 
 task default: ['test']
 
diff --git a/playbooks/pre-integration.yaml b/playbooks/pre-integration.yaml
index 90a14cc..c1b33aa 100644
--- a/playbooks/pre-integration.yaml
+++ b/playbooks/pre-integration.yaml
@@ -8,12 +8,12 @@
   tasks:
   - name: Install chef package
     shell:
-      cmd: ./scripts/install.sh -v 14
+      cmd: ./scripts/install.sh -v 15
       chdir: /home/zuul/src/opendev.org/openstack/openstack-chef/
     become: yes
   - name: Install berkshelf
-    shell: /opt/chef/embedded/bin/gem install --no-rdoc --no-ri berkshelf
+    shell: /opt/chef/embedded/bin/gem install -N berkshelf
     become: yes
   - name: Install cookstyle
-    shell: /opt/chef/embedded/bin/gem install --no-rdoc --no-ri cookstyle
+    shell: /opt/chef/embedded/bin/gem install -N cookstyle
     become: yes