Merge pull request puppetlabs#60 from mmz-srf/support-minus-in-servic…

…e-names Support minus in service names
quanghiem · Nov 18, 2013 · 0d4c50e · 0d4c50e
2 parents 41d070a + a950577
commit 0d4c50e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,5 +1,7 @@
 fixtures:
   repositories:
-    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
+    concat:
+      repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
+      ref: '1.0.0'
   symlinks:
     haproxy: "#{source_dir}"
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
@@ -97,7 +97,7 @@
 ) {
   # Template uses $ipaddresses, $server_name, $ports, $option
   concat::fragment { "${listening_service}_balancermember_${name}":
-    order   => "20-${listening_service}-${name}",
+    order   => "20-${listening_service}-01-${name}",
     ensure  => $ensure,
     target  => '/etc/haproxy/haproxy.cfg',
     content => template('haproxy/haproxy_balancermember.erb'),

diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
@@ -20,7 +20,7 @@
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
-      'order'   => '20-croy-tyler',
+      'order'   => '20-croy-01-tyler',
       'target'  => '/etc/haproxy/haproxy.cfg',
       'content' => "  server dero 1.1.1.1:18140  check\n"
     ) }
@@ -37,7 +37,7 @@
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
-      'order'   => '20-croy-tyler',
+      'order'   => '20-croy-01-tyler',
       'target'  => '/etc/haproxy/haproxy.cfg',
       'ensure'  => 'absent',
       'content' => "  server dero 1.1.1.1:18140  \n"
@@ -55,7 +55,7 @@
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
-      'order'   => '20-croy-tyler',
+      'order'   => '20-croy-01-tyler',
       'target'  => '/etc/haproxy/haproxy.cfg',
       'content' => "  server dero 1.1.1.1:18140  check close\n"
     ) }
@@ -73,7 +73,7 @@
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
-      'order'   => '20-croy-tyler',
+      'order'   => '20-croy-01-tyler',
       'target'  => '/etc/haproxy/haproxy.cfg',
       'content' => "  server dero 1.1.1.1:18140 cookie dero check close\n"
     ) }
@@ -91,7 +91,7 @@
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
-      'order'   => '20-croy-tyler',
+      'order'   => '20-croy-01-tyler',
       'target'  => '/etc/haproxy/haproxy.cfg',
       'content' => "  server server01 192.168.56.200:18140  check\n  server server02 192.168.56.201:18140  check\n"
     ) }
@@ -109,7 +109,7 @@
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
-      'order'   => '20-croy-tyler',
+      'order'   => '20-croy-01-tyler',
       'target'  => '/etc/haproxy/haproxy.cfg',
       'content' => "  server server01 192.168.56.200:18140,192.168.56.200:18150  check\n  server server02 192.168.56.201:18140,192.168.56.201:18150  check\n"
     ) }