Mercurial > repos > other > Puppet

changeset 147:6cb6dc1f74d4 puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to mercurial_keyring from Pip 1) it is more up to date than OBS's devel:tools build 2) it is basically the last package we *must* have OBS for
author IBBoard <dev@ibboard.co.uk>
date Sat, 25 Mar 2017 20:54:34 +0000
parents 816e35f86a5d
children d9fcabc75a1e
files manifests/templates.pp modules/vcs/manifests/init.pp
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/manifests/templates.pp	Sat Mar 25 20:18:13 2017 +0000
+++ b/manifests/templates.pp	Sat Mar 25 20:54:34 2017 +0000
@@ -22,6 +22,11 @@
 :hierarchy: common
 :logger: console",
 	}
+	# Fudge Pip to exist
+	file { '/usr/bin/pip-python':
+		ensure => link,
+		target => '/usr/bin/pip',
+	} -> Package <| provider == 'pip' |>
 }
 
 class basevpsnode (
--- a/modules/vcs/manifests/init.pp	Sat Mar 25 20:18:13 2017 +0000
+++ b/modules/vcs/manifests/init.pp	Sat Mar 25 20:54:34 2017 +0000
@@ -1,11 +1,14 @@
 class vcs {
     @package { [
             "mercurial",
-            "mercurial_keyring",
             "git"
         ]:
         ensure => installed
     }
+    @package { 'mercurial_keyring':
+        ensure => installed,
+        provider => 'pip',
+    }
 }
 
 class vcs::client inherits vcs {