From 091d948219e7b0a9f2322dfe666204810112b957 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sat, 29 Dec 2018 19:55:18 +0100 Subject: [PATCH] recommit for updates in build 19 --- CHANGELOG.md | 10 ++++ ...d_haproxy_3A_3Aserver_3A_3Aproxy_test.html | 6 ++- .../cd_haproxy_3A_3Aserver_3A_3Aproxy.html | 48 ++++++++++++++++++- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74d773d..f3c296f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+2222c8139395f02 Jenkins ConfDroid 2018-12-29 18:47:43 +

+

recommit for updates in build 18

+ +

+66f16e8e09c4d13 Arne Teuke 2018-12-29 18:47:00 +

+

adding template for testing

+ +

3b005f04a4e82e6 Jenkins ConfDroid 2018-12-29 18:44:26

recommit for updates in build 17

diff --git a/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html b/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html index 422dd92..963b53d 100644 --- a/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html +++ b/doc/puppet_classes/cd_haproxy_3A_3Aserver_3A_3Aproxy_test.html @@ -128,7 +128,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

28 29 30 -31 +31 +32
# File 'manifests/server/proxy_test.pp', line 23
@@ -138,7 +139,8 @@ class cd_haproxy::server::proxy_test (
 ) inherits cd_haproxy::params {
 
   cd_haproxy::server::proxy { 'testing':
-    frontend_name   =>  'test01',
+    frontend_name   =>  'test01-frontend',
+    backend_name    =>  'test01-backend',
   }
 
 }
diff --git a/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html b/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html index ff03805..67e00a2 100644 --- a/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html +++ b/doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html @@ -143,6 +143,32 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

+
  • + + backend_name + + + (Any) + + + (defaults to: undef) + + +
  • + +
  • + + backend_order + + + (Any) + + + (defaults to: '020') + + +
  • + @@ -170,7 +196,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    40 41 42 -43 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53
    # File 'manifests/server/proxy.pp', line 26
    @@ -179,11 +215,14 @@ define cd_haproxy::server::proxy (
     
     $frontend_name    = undef,
     $frontend_order   = '010',
    +$backend_name     = undef,
    +$backend_order    = '020',
     
     ) {
     
     $hy_main_config   = '/etc/haproxy/haproxy.cfg'
     $hy_frontendrule  = 'cd_haproxy/haproxy_frontend_rule.erb'
    +$hy_backendrule   = 'cd_haproxy/haproxy_backend_rule.erb'
     
       # create frontend section
       concat::fragment { "frontend_${name}":
    @@ -192,6 +231,13 @@ $hy_frontendrule  = 'cd_haproxy/haproxy_frontend_rule.erb'
         order   =>  $frontend_order,
       }
     
    +  # create backend section
    +  concat::fragment { "backend_${name}":
    +    target  =>  $hy_main_config,
    +    content =>  template($hy_backendrule),
    +    order   =>  $backend_order,
    +  }
    +
     }