openstack/puppet-openstack-integration
Code Issues Proposed changes

zed-only: Update bundler to 2.4.22

Browse Source 
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 1acedbb7ae to fix
lint errors.

Change-Id: Id49d5c16d9e0270b065e655aa92fab4502791cdb
This commit is contained in:
Takashi Kajinami
2023-04-24 10:23:37 +09:00
committed by Takashi Kajinami
parent 74d3210d87
commit 010c74fac2
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/neutron.pp
View File

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

24
manifests/swift.pp
View File

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

2
playbooks/prepare-node-integration.yaml
View File

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

2
playbooks/run-lint-tests.yaml
View File

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

2
playbooks/run-litmus-tests.yaml
View File

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

2
playbooks/run-syntax-tests.yaml
View File

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

2
playbooks/run-unit-tests.yaml
View File

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