From 9dc8f2e14bd7b2c132b79d4d6d43f97ead531037 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Fri, 1 Aug 2014 16:21:10 -0300 Subject: [PATCH] Not trying to install puppet if it's already there --- puppet/bootstrap.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/puppet/bootstrap.py b/puppet/bootstrap.py index 284d4d8..5058418 100644 --- a/puppet/bootstrap.py +++ b/puppet/bootstrap.py @@ -174,17 +174,19 @@ def main(): distro, release = get_release_name() print('Distro %s, release %s' % (distro, release)) - # Add repository - add_puppet_repository() + if not os.path.exists('/usr/bin/puppet'): + + # Add repository + add_puppet_repository() - # Install Puppet - if isubuntu(distro): - distro_update() + # Install Puppet + if isubuntu(distro): + distro_update() - result = package_install('puppet') - if result != 0: - print('Failed installing puppet') - exit(result) + result = package_install('puppet') + if result != 0: + print('Failed installing puppet') + exit(result) if os.path.isfile('/vagrant/puppet/hiera.yaml'): copyfile('/vagrant/puppet/hiera.yaml', '/etc/puppet/hiera.yaml') -- libgit2 0.21.2