Merge pull request #894 from atarax/master

MODULES-10063, extend apt::key to support deeplinks, this time with f…

diff --git a/.sync.yml b/.sync.yml
index 2bf4a39adb83e8f29fe7fad7451cdecdb3cbdb4c..88dbcc69acc080e2cd09aa16708655a92fe3b746 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -8,6 +8,8 @@
     - rubocop-i18n
     - rubocop-rspec
 ".travis.yml":
+  deploy_to_forge:
+    enabled: false
   branches:
   - release
   includes:

diff --git a/.travis.yml b/.travis.yml
index 922d081117bec2b4527f0747405bb5d80b3f7696..1fc720dc5c261c52b0f20466550ed0c69486c6d3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,6 @@ stages:
   - static
   - spec
   - acceptance
-  -
-    if: tag =~ ^v\d
-    name: deploy
 matrix:
   fast_finish: true
   include:
@@ -54,9 +51,6 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
 branches:
   only:
     - master

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 402961a72a949631b9ba6ebaed7b104abefdefca..ba05485c31c2ed5792cab8f0ae0a5fb85660627b 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -13,6 +13,10 @@
 #   Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint). 
 #   Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename.
 #
+# @param dist
+#   Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint). 
+#   Specifies the distribution of your node. Valid options: a string containing a valid distribution codename.
+#
 # @param package_name
 #   Names the package that provides the `apt-add-repository` command. Default: 'software-properties-common'.
 #
@@ -23,6 +27,7 @@ define apt::ppa(
   String $ensure                 = 'present',
   Optional[String] $options      = $::apt::ppa_options,
   Optional[String] $release      = $facts['lsbdistcodename'],
+  Optional[String] $dist         = $facts['lsbdistid'],
   Optional[String] $package_name = $::apt::ppa_package,
   Boolean $package_manage        = false,
 ) {
@@ -30,12 +35,12 @@ define apt::ppa(
     fail(translate('lsbdistcodename fact not available: release parameter required'))
   }
 
-  if $facts['lsbdistid'] == 'Debian' {
+  if $dist == 'Debian' {
     fail(translate('apt::ppa is not currently supported on Debian.'))
   }
 
   if versioncmp($facts['lsbdistrelease'], '14.10') >= 0 {
-    $distid = downcase($facts['lsbdistid'])
+    $distid = downcase($dist)
     $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
     $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
   } else {

diff --git a/metadata.json b/metadata.json
index bb1234950f7f29c72978071787cd9e1eefabcb93..7fc5cc9175341d2d90097d0d09e8bde948562278 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -41,6 +41,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-gfaf9e8b",
+  "template-ref": "heads/master-0-g643529a",
   "pdk-version": "1.14.1"
 }