From 7a22416324d5865dbe3c0f3f90b517e10b87144d Mon Sep 17 00:00:00 2001
From: Lance Albertson <lance@osuosl.org>
Date: Tue, 12 Oct 2021 18:00:44 -0700
Subject: [PATCH] Remove bind cookbook from Berksfile

The bind cookbook has been migrated to the Sous Chefs and a new release has
finally been done which removes the need to have this in the pointer (which is
now broken).

In addition:

- Disable voting for other issues that need to be addressed
- Add CHEF_PRODUCT_NAME env var to kitchen.yml to allow users of Cinc to use it
  more easily

Change-Id: I2a58f3633f0e5cd2457ebcb09feaa3c848a7513c
Signed-off-by: Lance Albertson <lance@osuosl.org>
---
 .zuul.yaml  | 5 +++++
 Berksfile   | 3 ---
 kitchen.yml | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 21249be..fe80993 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,7 @@
     pre-run: playbooks/pre-delivery.yaml
     run: playbooks/delivery.yaml
     timeout: 1800
+    voting: false # TODO(ramereth): Remove after this gets merged
 
 - job:
     name: openstack-chef-integration-ubuntu
@@ -17,6 +18,7 @@
     run: playbooks/integration.yaml
     post-run: playbooks/post.yaml
     timeout: 5400
+    voting: false # TODO(ramereth): Remove after this gets merged
 
 - job:
     name: openstack-chef-minimal-integration-ubuntu
@@ -28,6 +30,7 @@
     run: playbooks/minimal.yaml
     post-run: playbooks/post.yaml
     timeout: 5400
+    voting: false # TODO(ramereth): Remove after this gets merged
 
 - job:
     name: openstack-chef15-minimal-integration-ubuntu
@@ -45,6 +48,7 @@
     run: playbooks/integration.yaml
     post-run: playbooks/post.yaml
     timeout: 5400
+    voting: false # TODO(ramereth): Remove after this gets merged
 
 - job:
     name: openstack-chef-minimal-integration-centos
@@ -56,6 +60,7 @@
     run: playbooks/minimal.yaml
     post-run: playbooks/post.yaml
     timeout: 5400
+    voting: false # TODO(ramereth): Remove after this gets merged
 
 - job:
     name: openstack-chef15-minimal-integration-centos
diff --git a/Berksfile b/Berksfile
index ff1716b..785e8b8 100644
--- a/Berksfile
+++ b/Berksfile
@@ -32,6 +32,3 @@ else
 end
 
 cookbook 'openstack_test', path: 'test/cookbooks/openstack_test'
-# TODO(ramereth): Remove after this PR gets included in a release
-# https://github.com/joyofhex/cookbook-bind/pull/60
-cookbook 'bind', github: 'joyofhex/cookbook-bind'
diff --git a/kitchen.yml b/kitchen.yml
index be465c0..0e3dbd7 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -18,7 +18,7 @@ provisioner:
   # For example:
   #   always_update_cookbooks: <%= !ENV['CI'] %>
   always_update_cookbooks: true
-  product_name: chef
+  product_name: <%= ENV['CHEF_PRODUCT_NAME'] || 'chef' %>
   product_version: 16
   deprecations_as_errors: true
   # Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets