Skip to content

Commit

Permalink
Remove unused curl_prefix variable
Browse files Browse the repository at this point in the history
With change f223f66 (Convert to use
'archive' instead of 'staging' for rabbitmqadmin install) the
$curl_prefix variable became unused:
$ grep -ir curl_prefix
manifests/install/rabbitmqadmin.pp:      $curl_prefix = ''
manifests/install/rabbitmqadmin.pp:      $curl_prefix  = "--noproxy ${management_ip_address} -g -6"
manifests/install/rabbitmqadmin.pp:      $curl_prefix  = "--noproxy ${management_ip_address}"

Let's just remove them. Users have means to specify options
to the puppet-archive provider anyways.
  • Loading branch information
mbaldessari committed May 10, 2019
1 parent 9dcd416 commit 7045bb4
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions manifests/install/rabbitmqadmin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,10 @@

if !($management_ip_address) {
# Pull from localhost if we don't have an explicit bind address
$curl_prefix = ''
$sanitized_ip = '127.0.0.1'
} elsif $management_ip_address =~ Stdlib::Compat::Ipv6 {
$curl_prefix = "--noproxy ${management_ip_address} -g -6"
$sanitized_ip = join(enclose_ipv6(any2array($management_ip_address)), ',')
} else {
$curl_prefix = "--noproxy ${management_ip_address}"
$sanitized_ip = $management_ip_address
}

Expand Down

0 comments on commit 7045bb4

Please sign in to comment.