Merge pull request #653 from bastelfreak/archlinux

use correct datatype for $package_gpg_key
voxpupuli · Oct 18, 2017 · 9663f14 · 9663f14
2 parents 8de286f + 20f5cd7
commit 9663f14
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -207,7 +207,7 @@
   Optional[String] $node_ip_address                                = undef,
   Optional[Variant[Numeric, String]] $package_apt_pin              = undef,
   String $package_ensure                                           = $rabbitmq::params::package_ensure,
-  String $package_gpg_key                                          = $rabbitmq::params::package_gpg_key,
+  Optional[String] $package_gpg_key                                = $rabbitmq::params::package_gpg_key,
   String $package_name                                             = $rabbitmq::params::package_name,
   Optional[String] $package_source                                 = undef,
   Optional[String] $package_provider                               = undef,

diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp
@@ -1,8 +1,8 @@
 # Class: rabbitmq::repo::rhel
 # Makes sure that the Packagecloud repo is installed
 class rabbitmq::repo::rhel(
-    $location       = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch",
-    $key_source     = $rabbitmq::package_gpg_key,
+    $location          = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch",
+    String $key_source = $rabbitmq::package_gpg_key,
   ) {
 
   Class['rabbitmq::repo::rhel'] -> Package<| title == 'rabbitmq-server' |>