openstack
/
openstack-chef
Code Issues Proposed changes

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 <lance@osuosl.org>
Change-Id: Idfc0afd9ddbd9085f5b39267a50eb949930a0c70
This commit is contained in:
Lance Albertson 2021-03-04 15:27:08 -08:00
parent 8b56b0110f
commit f93767dbb2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/requirements.txt
View File

@ -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.31.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0

4
playbooks/roles/install-chef/tasks/main.yaml
View File

@ -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