openstack
/
puppet-tripleo
Code Issues Proposed changes

Disable curl globbing 

Disable curl globbing to allow Swift ringbuilder to upload to IPv6
upload addresses. Also dicable globbing in the other places curl
is used.

Change-Id: Iba51cc75bea26b775f790849f0b466a6528ee627
Closes-Bug: #1757118
(cherry picked from commit 8187a83259)
This commit is contained in:
Derek Higgins 2018-03-20 11:38:18 +00:00 committed by Bogdan Dobrelya
parent 165094e2d3
commit 9e55aa1d6e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/certmonger/ca/crl.pp
View File

@ -146,7 +146,7 @@ class tripleo::certmonger::ca::crl (
if $ensure == 'present' {
# Fetch CRL in cron job and notify needed services
$cmd_list = concat(["${sleep}curl -s -L -o ${fetched_crl} ${crl_source}"], $process_cmd, $reload_cmds)
$cmd_list = concat(["${sleep}curl -g -s -L -o ${fetched_crl} ${crl_source}"], $process_cmd, $reload_cmds)
$cron_cmd = join($cmd_list, ' && ')
} else {
$cron_cmd = absent

4
manifests/profile/base/swift/ringbuilder.pp
View File

@ -92,7 +92,7 @@ class tripleo::profile::base::swift::ringbuilder (
if $step >= 2 and $swift_ring_get_tempurl != '' {
exec{'fetch_swift_ring_tarball':
path => ['/usr/bin'],
command => "curl --insecure --silent --retry 3 '${swift_ring_get_tempurl}' -o /tmp/swift-rings.tar.gz",
command => "curl -g --insecure --silent --retry 3 '${swift_ring_get_tempurl}' -o /tmp/swift-rings.tar.gz",
returns => [0, 3],
timeout => 30,
tries => 3,
@ -157,7 +157,7 @@ class tripleo::profile::base::swift::ringbuilder (
}
exec{'upload_swift_ring_tarball':
path => ['/usr/bin'],
command => "curl --insecure --silent --retry 3 -X PUT '${$swift_ring_put_tempurl}' --data-binary @/tmp/swift-rings.tar.gz",
command => "curl -g --insecure --silent --retry 3 -X PUT '${$swift_ring_put_tempurl}' --data-binary @/tmp/swift-rings.tar.gz",
require => Exec['create_swift_ring_tarball'],
refreshonly => true,
timeout => 30,

4
spec/classes/tripleo_certmonger_ca_crl_spec.rb
View File

@ -45,7 +45,7 @@ describe 'tripleo::certmonger::ca::crl' do
end
let :cron_cmd do
"curl -s -L -o #{params[:crl_preprocessed]} #{params[:crl_source]} && #{process_cmd}"
"curl -g -s -L -o #{params[:crl_preprocessed]} #{params[:crl_source]} && #{process_cmd}"
end
it 'should create and process CRL file' do
@ -80,7 +80,7 @@ describe 'tripleo::certmonger::ca::crl' do
end
let :cron_cmd do
"curl -s -L -o #{params[:crl_dest]} #{params[:crl_source]}"
"curl -g -s -L -o #{params[:crl_dest]} #{params[:crl_source]}"
end
it 'should create and process CRL file' do

2
templates/redis/redis-notifications.sh.erb
View File

@ -7,7 +7,7 @@ ARG1=`echo $ARGS | awk '{print $1}'`
call_curl () {
DATA=`echo "s=$1&action=$2&b=%234" | sed -e s/:/%3A/`
curl --silent -o /dev/null $HAPROXY --data "$DATA"
curl -g --silent -o /dev/null $HAPROXY --data "$DATA"
echo curl $HAPROXY --data "$DATA"
return 0
}