From df12478f99a8e8669b2444819ed8db7545636960 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Thu, 4 Mar 2021 15:27:08 -0800 Subject: [PATCH] Pin berkshelf to < 7.2.0 to work around issues with Chef/Cinc 15 This works around a problem that was introducted in berkshelf-7.2.0 for Ruby 3.0 support that now breaks berks with the following error: ArgumentError wrong number of arguments (given 3, expected 1..2) This should be removed after we remove support for Chef/Cinc 15. In addition, fix version constraint on openstackdocstheme to fix doc builds. Signed-off-by: Lance Albertson Change-Id: Idfc0afd9ddbd9085f5b39267a50eb949930a0c70 --- doc/requirements.txt | 2 +- playbooks/roles/install-chef/tasks/main.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index b1ff253..22af501 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -4,5 +4,5 @@ # this is required for the docs build jobs sphinx>=1.8.0,!=2.1.0 # BSD -openstackdocstheme>=1.31.2 # Apache-2.0 +openstackdocstheme>=1.29.2 # Apache-2.0 reno>=2.5.0 # Apache-2.0 diff --git a/playbooks/roles/install-chef/tasks/main.yaml b/playbooks/roles/install-chef/tasks/main.yaml index f8330d1..ea75601 100644 --- a/playbooks/roles/install-chef/tasks/main.yaml +++ b/playbooks/roles/install-chef/tasks/main.yaml @@ -10,7 +10,9 @@ become: yes when: openstack_chef_client_type == 'cinc' - name: Install berkshelf - shell: /opt/chef/embedded/bin/gem install -N berkshelf + # TODO(ramereth): > 7.1.0 doesn't work with ruby 2.6 which is used on Chef/Cinc 15 + # Remove this once we remove testing for Chef/Cinc 15 + shell: /opt/chef/embedded/bin/gem install -N berkshelf -v 7.1.0 become: yes - name: Install cookstyle shell: /opt/chef/embedded/bin/gem install -N cookstyle