Merge pull request #27 from mwhahaha/prep-0.2.0

Update to 0.2.0

.gitignore

@@ -1,2 +1,3 @@
 pkg
 spec/fixtures/modules
+Gemfile.lock

.travis.yml

@@ -1,44 +1,20 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.5.3
+  - 2.5.7
 
-before_install: rm .gemfiles/Gemfile.rspec.lock || true
-gemfile: .gemfiles/Gemfile.rspec
+before_install: rm Gemfile.lock || true
+gemfile: Gemfile
 
 script:
  - "bundle exec rake lint"
  - "bundle exec rake syntax"
  - "bundle exec rake spec SPEC_OPTS='--format documentation'"
 
 env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.4.0"
-  - PUPPET_VERSION="~> 3.5.0"
-  - PUPPET_VERSION="~> 3.6.0"
-  - PUPPET_VERSION="~> 3.7.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_VERSION="~> 3.1.0"
-    - rvm: 2.1.1
-      env: PUPPET_VERSION="~> 2.7.0"
-    - rvm: 2.1.1
-      env: PUPPET_VERSION="~> 3.0.0"
-    - rvm: 2.1.1
-      env: PUPPET_VERSION="~> 3.1.0"
-    - rvm: 2.1.1
-      env: PUPPET_VERSION="~> 3.2.0"
-    - rvm: 2.1.1
-      env: PUPPET_VERSION="~> 3.3.0"
-    - rvm: 2.1.1
-      env: PUPPET_VERSION="~> 3.4.0"
+  - PUPPET_VERSION="~> 5.5.0"
+  - PUPPET_VERSION="~> 6.17.0"
+#matrix:
+#  exclude:
+#    - rvm: 2.5.3
+#      env: PUPPET_VERSION="~> 6.17.0"

Gemfile

@@ -0,0 +1,22 @@
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+gem 'metadata-json-lint'
+gem 'puppetlabs_spec_helper'
+gem 'rake'
+gem 'rspec-puppet'
+gem 'rspec-puppet-facts'
+gem 'rspec-puppet-utils'
+
+# vim:ft=ruby

Rakefile

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')
+# TODO(mwhahaha): remove this after deprecation period
+PuppetLint.configuration.send('disable_variable_is_lowercase')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 desc "Validate manifests, templates, and ruby files"

manifests/config/watchdog.pp

@@ -30,7 +30,7 @@
 #   String. The auth key to use for the watchdog.
 #   Defaults to <tt></tt>.
 #
-# [*delegate_IP*]
+# [*delegate_ip*]
 #   String. The virtual IP for pgpool.
 #   Defaults to <tt></tt>.
 #
@@ -125,6 +125,12 @@
 #   String. The directory where the UNIX domain socket accepting pgpool-II watchdog IPC connections will be created.
 #   Defaults to <tt>/tmp</tt>.
 #
+# === DEPECATED
+#
+# [*delegate_IP*]
+#   String. The virtual IP for pgpool.
+#   Defaults to <tt></tt>.
+#
 # === Variables
 #
 # N/A
@@ -144,7 +150,7 @@
   $wd_hostname                   = '',
   $wd_port                       = 9000,
   $wd_authkey                    = '',
-  $delegate_IP                   = '',
+  $delegate_ip                   = '',
   $ifconfig_path                 = '/sbin',
   $if_up_cmd                     = 'ifconfig eth0:0 inet $_IP_$ netmask 255.255.255.0',
   $if_down_cmd                   = 'ifconfig eth0:0 down',
@@ -167,16 +173,21 @@
   $wd_monitoring_interfaces_list = '',
   $wd_priority                   = 1,
   $wd_ipc_socket_dir             = '/tmp',
+  # deprecated
+  $delegate_IP                   = undef,
 ) {
 
+  if $delegate_IP {
+    warning('DEPRECATED: $delegate_IP has been replaced by $delegate_ip and will be removed in a future version')
+  }
   $watchdog_config = {
     'use_watchdog'                  => { value => $use_watchdog },
     'trusted_servers'               => { value => $trusted_servers },
     'ping_path'                     => { value => $ping_path },
     'wd_hostname'                   => { value => $wd_hostname },
     'wd_port'                       => { value => $wd_port },
     'wd_authkey'                    => { value => $wd_authkey },
-    'delegate_IP'                   => { value => $delegate_IP },
+    'delegate_IP'                   => { value => pick($delegate_IP, $delegate_ip) },
     'ifconfig_path'                 => { value => $ifconfig_path },
     'if_up_cmd'                     => { value => $if_up_cmd },
     'if_down_cmd'                   => { value => $if_down_cmd },

manifests/init.pp

@@ -150,15 +150,15 @@
   class { 'pgpool::config': }
 
   if ($ensure == absent) {
-    Anchor['pgpool::begin'] ->
-      Class['pgpool::service'] ->
-      Class['pgpool::config'] ->
-      Class['pgpool::package']
+    Anchor['pgpool::begin']
+      -> Class['pgpool::service']
+        -> Class['pgpool::config']
+          -> Class['pgpool::package']
   } else {
-    Anchor['pgpool::begin'] ->
-      Class['pgpool::package'] ->
-      Class['pgpool::config'] ->
-      Class['pgpool::service']
+    Anchor['pgpool::begin']
+      -> Class['pgpool::package']
+        -> Class['pgpool::config']
+          -> Class['pgpool::service']
 
   }
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "mwhahaha-pgpool",
-  "version": "0.1.14",
+  "version": "0.2.0",
   "author": "mwhahaha",
   "summary": "A puppet module to configure pgpool",
   "license": "Apache-2.0",
@@ -10,7 +10,7 @@
   "tags": [ "pgpool", "database", "postgresql" ],
   "dependencies": [
     {
-      "version_range": ">= 1.0.0 < 5.0.0",
+      "version_range": ">= 1.0.0 < 6.5.0",
       "name": "puppetlabs-stdlib"
     },
     {
@@ -35,35 +35,33 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7",
+        "8"
       ]
     },
     {
-      "operatingsystem": "OracleLinux",
+      "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "5",
-        "6"
+        "16.04",
+        "18.04",
+        "20.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=2.7.0 <4.0.0"
+      "version_requirement": ">=2.7.0 <7.0.0"
     }
   ]
 }