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

Auto-merge for build 77

See merge request puppet/puppet_cd!73

doc/puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html

@@ -124,30 +124,7 @@
 26
 27
 28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52</pre>
+29</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -175,29 +152,6 @@ class puppet_cd::firewall::iptables (
       }
     }
   }
-
-  if $fqdn == $pt_db_fqdn {
-    if $pt_use_ssl_only != true {
-      firewall { &quot;3${pt_no_ssl_port} open port ${pt_no_ssl_port}&quot;:
-        proto =&gt; &#39;tcp&#39;,
-        dport =&gt; $pt_no_ssl_port,
-        jump  =&gt; &#39;accept&#39;,
-      }
-      firewall { &quot;3${pt_ssl_port} open port ${pt_ssl_port}&quot;:
-        proto =&gt; &#39;tcp&#39;,
-        dport =&gt; $pt_ssl_port,
-        jump  =&gt; &#39;accept&#39;,
-      }
-    }
-
-    if $pt_use_ssl_only == true {
-      firewall { &quot;3${pt_ssl_port} open port ${pt_ssl_port}&quot;:
-        proto =&gt; &#39;tcp&#39;,
-        dport =&gt; $pt_ssl_port,
-        jump  =&gt; &#39;accept&#39;,
-      }
-    }
-  }
 }</pre>
       </td>
     </tr>

manifests/firewall/iptables.pp

@@ -26,27 +26,4 @@ class puppet_cd::firewall::iptables (
       }
     }
   }
-
-  if $fqdn == $pt_db_fqdn {
-    if $pt_use_ssl_only != true {
-      firewall { "3${pt_no_ssl_port} open port ${pt_no_ssl_port}":
-        proto => 'tcp',
-        dport => $pt_no_ssl_port,
-        jump  => 'accept',
-      }
-      firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
-        proto => 'tcp',
-        dport => $pt_ssl_port,
-        jump  => 'accept',
-      }
-    }
-
-    if $pt_use_ssl_only == true {
-      firewall { "3${pt_ssl_port} open port ${pt_ssl_port}":
-        proto => 'tcp',
-        dport => $pt_ssl_port,
-        jump  => 'accept',
-      }
-    }
-  }
 }