openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix lint error caused by lines with 140+ characters

Browse Source 
This fixes the following lint errors in lint jobs to unblock CI.

manifests/neutron.pp - WARNING: line has more than 140 characters on
line 254 (check: 140chars)
manifests/swift.pp - WARNING: line has more than 140 characters on
line 151 (check: 140chars)
manifests/swift.pp - WARNING: line has more than 140 characters on
line 155 (check: 140chars)
manifests/swift.pp - WARNING: line has more than 140 characters on
line 159 (check: 140chars)

Change-Id: Ifd2106b2db013891fda23344eacca1d097fef0d8
This commit is contained in:
Takashi Kajinami 2023-04-24 10:23:37 +09:00
parent 3d13e85e6a
commit 1acedbb7ae
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/neutron.pp
View File

@ -250,8 +250,9 @@ class openstack_integration::neutron (
if $facts['os']['family'] == 'Debian' { if $facts['os']['family'] == 'Debian' {
$auth_url = $::openstack_integration::config::keystone_auth_uri $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': 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'], environment => ['OS_PASSWORD=a_big_secret'],
path => '/usr/bin:/bin:/usr/sbin:/sbin', path => '/usr/bin:/bin:/usr/sbin:/sbin',
provider => shell, provider => shell,

24
manifests/swift.pp
View File

@ -148,16 +148,18 @@ class openstack_integration::swift {
include swift::ringbuilder include swift::ringbuilder
# As of mitaka swift-ring-builder requires devices >= replica count # As of mitaka swift-ring-builder requires devices >= replica count
# Default replica count is 3 # 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"]: [1, 2, 3].each |$dev| {
zone => 1, ring_object_device { "${::openstack_integration::config::ip_for_url}:6000/${dev}":
weight => 1, 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, ring_container_device { ["${::openstack_integration::config::ip_for_url}:6001/${dev}"]:
weight => 1, 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, ring_account_device { ["${::openstack_integration::config::ip_for_url}:6002/${dev}"]:
weight => 1, zone => 1,
weight => 1,
}
} }
} }