From 010c74fac2f335d16de0258e6c940f7d5a4558e7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 24 Apr 2023 10:23:37 +0900
Subject: [PATCH] zed-only: Update bundler to 2.4.22

There is an issue in rubygems that is shipped with Ruby 2.7.0 that
causes bundler install to loop forever when resolving dependencies.
Note that this change is proposed directly to stable/zed because
the pin was removed during 2024.1 cycle.

This also backports 1acedbb7ae26e725422f9080adae6793e7054a37 to fix
lint errors.

Change-Id: Id49d5c16d9e0270b065e655aa92fab4502791cdb
---
 manifests/neutron.pp                    |  3 ++-
 manifests/swift.pp                      | 24 +++++++++++++-----------
 playbooks/prepare-node-integration.yaml |  2 +-
 playbooks/run-lint-tests.yaml           |  2 +-
 playbooks/run-litmus-tests.yaml         |  2 +-
 playbooks/run-syntax-tests.yaml         |  2 +-
 playbooks/run-unit-tests.yaml           |  2 +-
 7 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 3b498414a..512a83210 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -208,8 +208,9 @@ class openstack_integration::neutron (
 
   if $::osfamily == 'Debian' {
     $auth_url = $::openstack_integration::config::keystone_auth_uri
+    $auth_opts = "--os-auth-url ${auth_url} --os-project-name services --os-username neutron --os-identity-api-version 3"
     exec { 'check-neutron-server':
-      command     => "openstack --os-auth-url ${auth_url} --os-project-name services --os-username neutron --os-identity-api-version 3 network list",
+      command     => "openstack ${auth_opts} network list",
       environment => ['OS_PASSWORD=a_big_secret'],
       path        => '/usr/bin:/bin:/usr/sbin:/sbin',
       provider    => shell,
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 98ad73505..8ca585513 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -145,16 +145,18 @@ class openstack_integration::swift {
   include swift::ringbuilder
   # As of mitaka swift-ring-builder requires devices >= replica count
   # Default replica count is 3
-  ring_object_device { ["${::openstack_integration::config::ip_for_url}:6000/1", "${::openstack_integration::config::ip_for_url}:6000/2", "${::openstack_integration::config::ip_for_url}:6000/3"]:
-    zone   => 1,
-    weight => 1,
-  }
-  ring_container_device { ["${::openstack_integration::config::ip_for_url}:6001/1", "${::openstack_integration::config::ip_for_url}:6001/2", "${::openstack_integration::config::ip_for_url}:6001/3"]:
-    zone   => 1,
-    weight => 1,
-  }
-  ring_account_device { ["${::openstack_integration::config::ip_for_url}:6002/1", "${::openstack_integration::config::ip_for_url}:6002/2", "${::openstack_integration::config::ip_for_url}:6002/3"]:
-    zone   => 1,
-    weight => 1,
+  [1, 2, 3].each |$dev| {
+    ring_object_device { "${::openstack_integration::config::ip_for_url}:6000/${dev}":
+      zone   => 1,
+      weight => 1,
+    }
+    ring_container_device { ["${::openstack_integration::config::ip_for_url}:6001/${dev}"]:
+      zone   => 1,
+      weight => 1,
+    }
+    ring_account_device { ["${::openstack_integration::config::ip_for_url}:6002/${dev}"]:
+      zone   => 1,
+      weight => 1,
+    }
   }
 }
diff --git a/playbooks/prepare-node-integration.yaml b/playbooks/prepare-node-integration.yaml
index ec41c2a31..a652c4f2c 100644
--- a/playbooks/prepare-node-integration.yaml
+++ b/playbooks/prepare-node-integration.yaml
@@ -51,7 +51,7 @@
         cmd: |
           ruby <<EOF
           cmd = 'gem install bundler --no-document --verbose --no-user-install'
-          cmd += ' -v 2.2.11'
+          cmd += ' -v 2.4.22'
           system(cmd)
           EOF
       environment:
diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml
index 385cc3dde..6447c8f3d 100644
--- a/playbooks/run-lint-tests.yaml
+++ b/playbooks/run-lint-tests.yaml
@@ -23,7 +23,7 @@
           if [ -f Gemfile ]; then
             ruby <<EOF
           cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
-          cmd += ' -v 2.2.11'
+          cmd += ' -v 2.4.22'
           system(cmd)
           EOF
             $GEM_BIN_DIR/bundle install --without system_tests --retry 3
diff --git a/playbooks/run-litmus-tests.yaml b/playbooks/run-litmus-tests.yaml
index 0d6181c78..545ded333 100644
--- a/playbooks/run-litmus-tests.yaml
+++ b/playbooks/run-litmus-tests.yaml
@@ -20,7 +20,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
           cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
-          cmd += ' -v 2.2.11'
+          cmd += ' -v 2.4.22'
           system(cmd)
           EOF
           $GEM_BIN_DIR/bundle install --without system_tests --retry 3
diff --git a/playbooks/run-syntax-tests.yaml b/playbooks/run-syntax-tests.yaml
index a3a603969..8677e1545 100644
--- a/playbooks/run-syntax-tests.yaml
+++ b/playbooks/run-syntax-tests.yaml
@@ -8,7 +8,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
           cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
-          cmd += ' -v 2.2.11'
+          cmd += ' -v 2.4.22'
           system(cmd)
           EOF
           $GEM_BIN_DIR/bundle install --retry 3
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index 681b3e19c..32a24a24b 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -20,7 +20,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
           cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
-          cmd += ' -v 2.2.11'
+          cmd += ' -v 2.4.22'
           system(cmd)
           EOF
           $GEM_BIN_DIR/bundle install --retry 3