Merge branch 'jenkins-build-5' into 'master'
Auto-merge for build 5 See merge request puppet/postgresql_cd!2
This commit is contained in:
@@ -133,10 +133,10 @@
|
|||||||
<span class='name'>reqpackages_server</span>
|
<span class='name'>reqpackages_server</span>
|
||||||
|
|
||||||
|
|
||||||
<span class='type'>(<tt>String</tt>)</span>
|
<span class='type'>(<tt>Array</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
<em class="default">(defaults to: <tt>'postgresql-server'</tt>)</em>
|
<em class="default">(defaults to: <tt>['postgresql-server','postgresql-contrib']</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
—
|
—
|
||||||
@@ -363,7 +363,7 @@ class postgresql_cd::params (
|
|||||||
String $pl_server_fqdn = undef,
|
String $pl_server_fqdn = undef,
|
||||||
|
|
||||||
# installation
|
# installation
|
||||||
String $reqpackages_server = 'postgresql-server',
|
Array $reqpackages_server = ['postgresql-server','postgresql-contrib'],
|
||||||
String $reqpackages_client = 'postgresql',
|
String $reqpackages_client = 'postgresql',
|
||||||
String $pkg_ensure = 'latest',
|
String $pkg_ensure = 'latest',
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
# Author: Arne Teuke (arne_teuke@confdroid.com)
|
# Author: Arne Teuke (arne_teuke@confdroid.com)
|
||||||
# @param [String] pl_server_fqdn the fqdn of the postgresql server. Any other
|
# @param [String] pl_server_fqdn the fqdn of the postgresql server. Any other
|
||||||
# system will be configured as client
|
# system will be configured as client
|
||||||
# @param [String] reqpackages_server the packages for the server
|
# @param [Array] reqpackages_server the packages for the server
|
||||||
# @param [String] reqpackages_client the packages for the client
|
# @param [String] reqpackages_client the packages for the client
|
||||||
# @param [String] pkg_ensure which version of the packages to install, i.e.
|
# @param [String] pkg_ensure which version of the packages to install, i.e.
|
||||||
# 'latest', 'present' '13.20',
|
# 'latest', 'present' '13.20',
|
||||||
@@ -21,7 +21,7 @@ class postgresql_cd::params (
|
|||||||
String $pl_server_fqdn = undef,
|
String $pl_server_fqdn = undef,
|
||||||
|
|
||||||
# installation
|
# installation
|
||||||
String $reqpackages_server = 'postgresql-server',
|
Array $reqpackages_server = ['postgresql-server','postgresql-contrib'],
|
||||||
String $reqpackages_client = 'postgresql',
|
String $reqpackages_client = 'postgresql',
|
||||||
String $pkg_ensure = 'latest',
|
String $pkg_ensure = 'latest',
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user