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

Auto-merge for build 9

See merge request puppet/postgresql_cd!6

doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Ainitdb.html

@@ -113,7 +113,9 @@
 15
 16
 17
-18</pre>
+18
+19
+20</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/initdb.pp', line 6</span>
@@ -122,6 +124,8 @@ class postgresql_cd::server::initdb (
 
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
+    require postgresql_cd::main::install
+
     exec { &#39;init_pgsql_db&#39;:
       command =&gt; &#39;postgresql-setup --initdb&#39;,
       creates =&gt; &quot;${pl_data_dir}/PG_VERSION&quot;,

doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html

@@ -125,7 +125,7 @@ class postgresql_cd::server::service (
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
     require postgresql_cd::firewall::iptables
-    require postgresql_cd::server::initdb
+    include postgresql_cd::server::initdb
 
     service { $pl_service:
       ensure     => running,

manifests/server/initdb.pp

@@ -7,6 +7,8 @@ class postgresql_cd::server::initdb (
 
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
+    require postgresql_cd::main::install
+
     exec { 'init_pgsql_db':
       command => 'postgresql-setup --initdb',
       creates => "${pl_data_dir}/PG_VERSION",

manifests/server/service.pp

@@ -8,7 +8,7 @@ class postgresql_cd::server::service (
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
     require postgresql_cd::firewall::iptables
-    require postgresql_cd::server::initdb
+    include postgresql_cd::server::initdb
 
     service { $pl_service:
       ensure     => running,