Merge branch 'jenkins-build-15' into 'master'

Auto-merge for build 15

See merge request puppet/haproxy_cd!2

Jenkinsfile

@@ -91,7 +91,12 @@ pipeline {
                 git config user.name "Jenkins Server"
                 git config user.email jenkins@confdroid.com
                 git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push origin HEAD:master
+                git push -o merge_request.create \
+                         -o merge_request.target=master \
+                         -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
+                         -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
+                         -o merge_request.merge_when_pipeline_succeeds=true \
+                         origin jenkins-build-$BUILD_NUMBER
             '''
         }
       }

README.md

@@ -12,7 +12,7 @@
 
 ## WARNING
 
-***Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production***
+>**Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production**
 
 ## Features
 

doc/file.README.html

@@ -72,7 +72,9 @@
 
 <h2 id="label-WARNING">WARNING</h2>
 
-<p><strong><em>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</em></strong></p>
+<blockquote>
+<p><strong>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</strong></p>
+</blockquote>
 
 <h2 id="label-Features">Features</h2>
 

doc/index.html

@@ -72,7 +72,9 @@
 
 <h2 id="label-WARNING">WARNING</h2>
 
-<p><strong><em>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</em></strong></p>
+<blockquote>
+<p><strong>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</strong></p>
+</blockquote>
 
 <h2 id="label-Features">Features</h2>
 

doc/puppet_classes/haproxy_cd_3A_3Amonitoring_3A_3Afail2ban.html

@@ -144,7 +144,7 @@ class haproxy_cd::monitoring::fail2ban (
 
 ) inherits haproxy_cd::params {
   if $hy_manage_fail2ban == true {
-    require fail2ban_cd # (external module)
+    require confdroid_fail2ban # (external module)
 
     # configure filter
 

manifests/monitoring/fail2ban.pp

@@ -6,7 +6,7 @@ class haproxy_cd::monitoring::fail2ban (
 
 ) inherits haproxy_cd::params {
   if $hy_manage_fail2ban == true {
-    require fail2ban_cd # (external module)
+    require confdroid_fail2ban # (external module)
 
     # configure filter