Skip to content

Commit 04e0ffa

Browse files
authored
Merge pull request #522 from puppetlabs/release-prep
Release prep v6.3.0
2 parents 4f3ec08 + 9c96df0 commit 04e0ffa

File tree

4 files changed

+132
-7
lines changed

4 files changed

+132
-7
lines changed

CHANGELOG.md

+22-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,28 @@
22

33
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
44

5-
## [v6.2.1](https://github.com/puppetlabs/puppetlabs-haproxy/tree/v6.2.1) (2021-08-25)
5+
## [v6.3.0](https://github.com/puppetlabs/puppetlabs-haproxy/tree/v6.3.0) (2022-06-13)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-haproxy/compare/v6.2.1...v6.3.0)
8+
9+
### Added
10+
11+
- pdksync - \(GH-cat-12\) Add Support for Redhat 9 [\#519](https://github.com/puppetlabs/puppetlabs-haproxy/pull/519) ([david22swan](https://github.com/david22swan))
12+
- Allow specifying mapfile entries to be collected later [\#508](https://github.com/puppetlabs/puppetlabs-haproxy/pull/508) ([yakatz](https://github.com/yakatz))
13+
- Added possibility filling description field [\#504](https://github.com/puppetlabs/puppetlabs-haproxy/pull/504) ([michaelkoettenstorfer](https://github.com/michaelkoettenstorfer))
14+
- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#502](https://github.com/puppetlabs/puppetlabs-haproxy/pull/502) ([david22swan](https://github.com/david22swan))
15+
- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#501](https://github.com/puppetlabs/puppetlabs-haproxy/pull/501) ([david22swan](https://github.com/david22swan))
16+
- Adding chroot\_dir\_manage parameter. [\#498](https://github.com/puppetlabs/puppetlabs-haproxy/pull/498) ([Tamerz](https://github.com/Tamerz))
17+
18+
### Fixed
19+
20+
- pdksync - \(GH-iac-334\) Remove Support for Ubuntu 14.04/16.04 [\#511](https://github.com/puppetlabs/puppetlabs-haproxy/pull/511) ([david22swan](https://github.com/david22swan))
21+
- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#507](https://github.com/puppetlabs/puppetlabs-haproxy/pull/507) ([david22swan](https://github.com/david22swan))
22+
- \[MODULES-11274\] Allow usage of parameter manage\_config\_dir [\#506](https://github.com/puppetlabs/puppetlabs-haproxy/pull/506) ([tuxmea](https://github.com/tuxmea))
23+
- haproxy\_userlist: fix empty users/groups handling. [\#505](https://github.com/puppetlabs/puppetlabs-haproxy/pull/505) ([bzed](https://github.com/bzed))
24+
- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#500](https://github.com/puppetlabs/puppetlabs-haproxy/pull/500) ([david22swan](https://github.com/david22swan))
25+
26+
## [v6.2.1](https://github.com/puppetlabs/puppetlabs-haproxy/tree/v6.2.1) (2021-08-26)
627

728
[Full Changelog](https://github.com/puppetlabs/puppetlabs-haproxy/compare/v6.2.0...v6.2.1)
829

REFERENCE.md

+107-5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ haproxy.cfg on the load balancer.
3131
* [`haproxy::mailers`](#haproxymailers): This type will set up a mailers entry in haproxy.cfg on the load balancer.
3232
* [`haproxy::mapfile`](#haproxymapfile): Manage an HAProxy map file as documented in
3333
https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#7.3.1-map
34+
* [`haproxy::mapfile::entry`](#haproxymapfileentry): Manage an HAProxy map file as documented in
35+
https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#7.3.1-map
3436
* [`haproxy::peer`](#haproxypeer): This type will set up a peer entry inside the peers configuration block in haproxy.cfg on the load balancer.
3537
* [`haproxy::peer::collect_exported`](#haproxypeercollect_exported): Private define
3638
* [`haproxy::peers`](#haproxypeers): This type will set up a peers entry in haproxy.cfg
@@ -102,6 +104,7 @@ The following parameters are available in the `haproxy` class:
102104
* [`service_manage`](#service_manage)
103105
* [`service_name`](#service_name)
104106
* [`service_options`](#service_options)
107+
* [`chroot_dir_manage`](#chroot_dir_manage)
105108
* [`sysconfig_options`](#sysconfig_options)
106109
* [`global_options`](#global_options)
107110
* [`defaults_options`](#defaults_options)
@@ -168,6 +171,15 @@ Contents for the `/etc/defaults/haproxy` file on Debian. Defaults to "ENABLED=1\
168171

169172
Default value: `$haproxy::params::service_options`
170173

174+
##### <a name="chroot_dir_manage"></a>`chroot_dir_manage`
175+
176+
Data type: `Boolean`
177+
178+
Chooses whether the haproxy chroot directory should be managed by puppet
179+
at all. Defaults to true
180+
181+
Default value: ``true``
182+
171183
##### <a name="sysconfig_options"></a>`sysconfig_options`
172184

173185
Data type: `Any`
@@ -348,6 +360,7 @@ The following parameters are available in the `haproxy::backend` defined type:
348360

349361
* [`section_name`](#section_name)
350362
* [`mode`](#mode)
363+
* [`description`](#description)
351364
* [`options`](#options)
352365
* [`collect_exported`](#collect_exported)
353366
* [`config_file`](#config_file)
@@ -373,6 +386,16 @@ The mode of operation for the backend service. Valid values are undef,
373386

374387
Default value: ``undef``
375388

389+
##### <a name="description"></a>`description`
390+
391+
Data type: `Any`
392+
393+
Allows to add a sentence to describe the related object in the HAProxy HTML
394+
stats page. The description will be printed on the right of the object name
395+
it describes. Usefull in huge environments
396+
397+
Default value: ``undef``
398+
376399
##### <a name="options"></a>`options`
377400

378401
Data type: `Any`
@@ -756,6 +779,7 @@ The following parameters are available in the `haproxy::frontend` defined type:
756779
* [`bind`](#bind)
757780
* [`ipaddress`](#ipaddress)
758781
* [`mode`](#mode)
782+
* [`description`](#description)
759783
* [`bind_options`](#bind_options)
760784
* [`options`](#options)
761785
* [`sort_options_alphabetic`](#sort_options_alphabetic)
@@ -813,6 +837,16 @@ The mode of operation for the frontend service. Valid values are undef,
813837

814838
Default value: ``undef``
815839

840+
##### <a name="description"></a>`description`
841+
842+
Data type: `Any`
843+
844+
Allows to add a sentence to describe the related object in the HAProxy HTML
845+
stats page. The description will be printed on the right of the object name
846+
it describes. Usefull in huge environments
847+
848+
Default value: ``undef``
849+
816850
##### <a name="bind_options"></a>`bind_options`
817851

818852
Data type: `Any`
@@ -978,6 +1012,7 @@ The following parameters are available in the `haproxy::instance` defined type:
9781012
* [`package_name`](#package_name)
9791013
* [`service_ensure`](#service_ensure)
9801014
* [`service_manage`](#service_manage)
1015+
* [`chroot_dir_manage`](#chroot_dir_manage)
9811016
* [`service_name`](#service_name)
9821017
* [`global_options`](#global_options)
9831018
* [`defaults_options`](#defaults_options)
@@ -1026,6 +1061,15 @@ all. Defaults to true
10261061

10271062
Default value: ``true``
10281063

1064+
##### <a name="chroot_dir_manage"></a>`chroot_dir_manage`
1065+
1066+
Data type: `Boolean`
1067+
1068+
Chooses whether the haproxy chroot directory should be managed by puppet
1069+
at all. Defaults to true
1070+
1071+
Default value: ``true``
1072+
10291073
##### <a name="service_name"></a>`service_name`
10301074

10311075
Data type: `Optional[String]`
@@ -1191,7 +1235,7 @@ Default value: ``undef``
11911235

11921236
##### <a name="haproxy_unit_template"></a>`haproxy_unit_template`
11931237

1194-
Data type: `Optional[String]`
1238+
Data type: `String`
11951239

11961240

11971241

@@ -1238,6 +1282,7 @@ The following parameters are available in the `haproxy::listen` defined type:
12381282
* [`ipaddress`](#ipaddress)
12391283
* [`bind`](#bind)
12401284
* [`mode`](#mode)
1285+
* [`description`](#description)
12411286
* [`options`](#options)
12421287
* [`bind_options`](#bind_options)
12431288
* [`collect_exported`](#collect_exported)
@@ -1294,6 +1339,16 @@ The mode of operation for the listening service. Valid values are undef,
12941339

12951340
Default value: ``undef``
12961341

1342+
##### <a name="description"></a>`description`
1343+
1344+
Data type: `Any`
1345+
1346+
Allows to add a sentence to describe the related object in the HAProxy HTML
1347+
stats page. The description will be printed on the right of the object name
1348+
it describes. Usefull in huge environments
1349+
1350+
Default value: ``undef``
1351+
12971352
##### <a name="options"></a>`options`
12981353

12991354
Data type: `Any`
@@ -1305,7 +1360,7 @@ Default value: `{
13051360
'option' => [
13061361
'tcplog',
13071362
],
1308-
'balance' => 'roundrobin'
1363+
'balance' => 'roundrobin',
13091364
}`
13101365

13111366
##### <a name="bind_options"></a>`bind_options`
@@ -1464,7 +1519,8 @@ Manage an HAProxy map file as documented in
14641519
https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#7.3.1-map
14651520

14661521
* **Note** A map file contains one key + value per line. These key-value pairs are
1467-
specified in the `mappings` array.
1522+
specified in the `mappings` array or by additional `haproxy::mapfile::entry`
1523+
definitions.
14681524

14691525
#### Parameters
14701526

@@ -1486,7 +1542,7 @@ A '.map' extension will be added automatically.
14861542

14871543
##### <a name="mappings"></a>`mappings`
14881544

1489-
Data type: `Array`
1545+
Data type: `Array[Variant[String, Hash]]`
14901546

14911547
An array of mappings for this map file. Array elements may be Hashes with a
14921548
single key-value pair each (preferably) or simple Strings. Default: `[]`
@@ -1534,7 +1590,53 @@ Array of managed HAproxy instance names to notify (restart/reload) when the
15341590
map file is updated. This is so that the same map file can be used with
15351591
multiple HAproxy instances. Default: `[ 'haproxy' ]`
15361592

1537-
Default value: `[ 'haproxy' ]`
1593+
Default value: `['haproxy']`
1594+
1595+
### <a name="haproxymapfileentry"></a>`haproxy::mapfile::entry`
1596+
1597+
Manage an HAProxy map file as documented in
1598+
https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#7.3.1-map
1599+
1600+
* **Note** A map file contains one key + value per line. These key-value pairs are
1601+
specified in the `mappings` array.
1602+
1603+
#### Parameters
1604+
1605+
The following parameters are available in the `haproxy::mapfile::entry` defined type:
1606+
1607+
* [`name`](#name)
1608+
* [`mappings`](#mappings)
1609+
* [`mapfile`](#mapfile)
1610+
* [`order`](#order)
1611+
1612+
##### <a name="name"></a>`name`
1613+
1614+
The namevar of the defined resource type is the filename of the map file
1615+
(without any extension), relative to the `haproxy::config_dir` directory.
1616+
A '.map' extension will be added automatically.
1617+
1618+
##### <a name="mappings"></a>`mappings`
1619+
1620+
Data type: `Array[Variant[String, Hash]]`
1621+
1622+
An array of mappings for this map file. Array elements may be Hashes with a
1623+
single key-value pair each (preferably) or simple Strings. Default: `[]`
1624+
1625+
Default value: `[$title]`
1626+
1627+
##### <a name="mapfile"></a>`mapfile`
1628+
1629+
Data type: `String`
1630+
1631+
1632+
1633+
##### <a name="order"></a>`order`
1634+
1635+
Data type: `Variant[String, Integer]`
1636+
1637+
1638+
1639+
Default value: `'10'`
15381640

15391641
### <a name="haproxypeer"></a>`haproxy::peer`
15401642

metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-haproxy",
3-
"version": "6.2.1",
3+
"version": "6.3.0",
44
"author": "puppetlabs",
55
"summary": "Configures HAProxy servers and manages the configuration of backend member servers.",
66
"license": "Apache-2.0",

pdk.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
ignore: []

0 commit comments

Comments
 (0)