summaryrefslogtreecommitdiff
path: root/manifests/listen.pp
diff options
context:
space:
mode:
authorGary Larizza <gary@puppetlabs.com>2012-10-12 15:17:48 -0700
committerGary Larizza <gary@puppetlabs.com>2012-10-12 15:17:48 -0700
commitfa67a136a0e2df377c2650cfd45f5941505401be (patch)
tree009fd499ea08576fcad96d47019ff0b432e7e630 /manifests/listen.pp
parent3c5fefaf650776569d7ee6f842231f5709fac1d9 (diff)
parent57557202f5ccd16ccd276ce3997a3f8d370e8c60 (diff)
Merge pull request #17 from hunner/fix_order
Fix order
Diffstat (limited to 'manifests/listen.pp')
-rw-r--r--manifests/listen.pp9
1 files changed, 1 insertions, 8 deletions
diff --git a/manifests/listen.pp b/manifests/listen.pp
index 40e2cf1..5dea8a8 100644
--- a/manifests/listen.pp
+++ b/manifests/listen.pp
@@ -26,11 +26,6 @@
# comma-separated string or an array of strings which may be ports or
# hyphenated port ranges.
#
-# [*order*]
-# The order, or numerical weight, of the fragment created by this defined
-# resource type. This is necessary to ensure the fragment is associated
-# with the correct listening service instance.
-#
# [*ipaddress*]
# The ip address the proxy binds to. Empty addresses, '*', and '0.0.0.0'
# mean that the proxy listens to all valid addresses on the system.
@@ -56,7 +51,6 @@
# Exporting the resource for a balancer member:
#
# haproxy::listen { 'puppet00':
-# order => '20',
# ipaddress => $::ipaddress,
# ports => '18140',
# mode => 'tcp',
@@ -75,7 +69,6 @@
#
define haproxy::listen (
$ports,
- $order = '20',
$ipaddress = $::ipaddress,
$mode = 'tcp',
$collect_exported = true,
@@ -89,7 +82,7 @@ define haproxy::listen (
) {
# Template uses: $name, $ipaddress, $ports, $options
concat::fragment { "${name}_listen_block":
- order => $order,
+ order => "20-${name}",
target => '/etc/haproxy/haproxy.cfg',
content => template('haproxy/haproxy_listen_block.erb'),
}