From 60c9abb54353ebe843b7e9929a10409e607fb7f5 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 1 Mar 2020 23:39:42 +0100
Subject: [PATCH] update to PDK 1.17.0

---
 .gitlab-ci.yml |  8 ++++----
 .rspec         |  1 -
 .travis.yml    | 10 ++++++++--
 README.md      |  2 +-
 REFERENCE.md   | 11 ++++++-----
 metadata.json  | 14 ++++++++------
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd448e8..4868bf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,17 +18,17 @@ before_script:
   - bundle -v
   - bundle install --without system_tests --path vendor/bundle --jobs $(nproc)
 
-syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.3-Puppet ~> 6:
+syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.7-Puppet ~> 6:
   stage: syntax
-  image: ruby:2.5.3
+  image: ruby:2.5.7
   script:
     - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
   variables:
     PUPPET_GEM_VERSION: '~> 6'
 
-parallel_spec-Ruby 2.5.3-Puppet ~> 6:
+parallel_spec-Ruby 2.5.7-Puppet ~> 6:
   stage: unit
-  image: ruby:2.5.3
+  image: ruby:2.5.7
   script:
     - bundle exec rake parallel_spec
   variables:
diff --git a/.rspec b/.rspec
index eef7b0f..16f9cdb 100644
--- a/.rspec
+++ b/.rspec
@@ -1,3 +1,2 @@
 --color
 --format documentation
---fail-fast
diff --git a/.travis.yml b/.travis.yml
index 0e27424..7bdc8a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,14 @@ script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.3
+  - 2.5.7
 stages:
   - static
   - spec
   - acceptance
+  -
+    if: tag =~ ^v\d
+    name: deploy
 jobs:
   fast_finish: true
   include:
@@ -129,8 +132,11 @@ jobs:
       stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.3
+      rvm: 2.5.7
       stage: spec
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
 branches:
   only:
     - master
diff --git a/README.md b/README.md
index f7ce5e3..caa8ab1 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ NOTE: The "master" branch on GitHub contains the development version, which may
 
 ## Overview
 
-This module will massage puppetlabs-mysql into creating a MySQL or MariaDB galera cluster.
+This module will massage puppetlabs-mysql into creating a Galera cluster on MySQL, MariaDB or XtraDB. It also supports setting up an Arbitrator node.
 
 It will try to recover from failures by bootstrapping on a node designated as the master if no other nodes appear to be running mysql, but if the cluster goes down and the master is permanently taken out, another node will need to be specified as the 'master' that can bootstrap the cluster.
 
diff --git a/REFERENCE.md b/REFERENCE.md
index 32b3955..d5663f4 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -173,12 +173,11 @@ if you wish to manage your root .my.cnf file elsewhere. Default: `true`
 
 ##### `create_root_user`
 
-Data type: `Optional[String]`
+Data type: `Optional[Boolean]`
 
 A flag to indicate if we should manage the root user. Set this to false if
-you wish to manage your root user elsewhere. If this is set to undef, we
-will use true if galera_master == $::fqdn. Valid options: a string or
-undef.
+you wish to manage your root user elsewhere. If this is set to `undef`, the
+module will use `true` if this node is `$galera_master`. Default: `undef`
 
 Default value: `undef`
 
@@ -221,13 +220,15 @@ Default: `$fqdn`
 
 ##### `galera_package_ensure`
 
-Data type: `String`
+Data type: `Optional[String]`
 
 Specifies the ensure state for the galera package. Note that some vendors
 do not allow installation of the wsrep-enabled MySQL/MariaDB and galera
 (arbitrator) on the same server. Valid options: all values supported by
 the package type. Default: `absent`
 
+Default value: `undef`
+
 ##### `galera_package_name`
 
 Data type: `Optional[String]`
diff --git a/metadata.json b/metadata.json
index d7da4a1..afd8a63 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,7 +2,7 @@
   "name": "fraenki-galera",
   "version": "1.0.6",
   "author": "Frank Wall",
-  "summary": "Install/configure MySQL with Galera",
+  "summary": "Setup a Galera cluster on MySQL/MariaDB/XtraDB with Arbitrator support",
   "license": "BSD-2-Clause",
   "source": "https://github.com/fraenki/puppet-galera",
   "project_page": "https://github.com/fraenki/puppet-galera",
@@ -75,7 +75,7 @@
       "version_requirement": ">= 5.5.8 < 7.0.0"
     }
   ],
-  "description": "Install/configure MySQL with Galera/XtraDB cluster support",
+  "description": "Setup a Galera cluster on MySQL/MariaDB/XtraDB with Arbitrator support",
   "tags": [
     "mysql",
     "percona",
@@ -85,9 +85,11 @@
     "codership",
     "cluster",
     "wsrep",
-    "xtradb"
+    "xtradb",
+    "arbitrator",
+    "garbd"
   ],
-  "pdk-version": "1.16.0",
-  "template-url": "pdk-default#1.16.0",
-  "template-ref": "tags/1.16.0-0-gaf44904"
+  "pdk-version": "1.17.0",
+  "template-url": "pdk-default#1.17.0",
+  "template-ref": "tags/1.17.0-0-gd3a4319"
 }