opendev/puppet-ethercalc
Code Issues Proposed changes

Replace manual git work with vcsrepo module.

Browse Source 
Change-Id: Ia0f3acd50aab07cc83d13cd12c8f7fc67f1c697d
Reviewed-on: https://review.openstack.org/10832
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Monty Taylor 2012-08-04 09:55:37 -05:00 committed by Jenkins
parent 5b2d6fdf85
commit 8e6332a9a1
1 changed files with 13 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
manifests/init.pp
View File

@ -1,49 +1,3 @@
# define to manage a git repo (should replace with vcsrepo module)
define git_repo (
$repo,
$dest,
$user = 'root',
$branch = 'master',
$clone_only = undef
) {
if $clone_only == 'true' {
$checkout_condition = "false"
}
else {
$checkout_condition = "test -d ${dest}"
}
# if we already have the git repo the pull updates
exec { "update_${title}":
command => "git pull --ff-only origin ${branch}",
cwd => $dest,
path => '/bin:/usr/bin',
user => $user,
onlyif => $checkout_condition,
before => Exec["clone_${title}"],
}
# otherwise get a new clone of it
exec { "clone_${title}":
command => "git clone ${repo} ${dest}",
path => '/bin:/usr/bin',
user => $user,
onlyif => "test ! -d ${dest}",
} ->
exec { "checkout_${title}_${branch}":
command => "git checkout ${branch}",
path => '/bin:/usr/bin',
cwd => $dest,
user => $user,
subscribe => Exec["clone_${title}"],
refreshonly => true,
onlyif => "test -d ${dest}"
}
}
# define to build from source using ./configure && make && make install. # define to build from source using ./configure && make && make install.
define buildsource( define buildsource(
$dir = $title, $dir = $title,
@ -114,11 +68,11 @@ class etherpad_lite (
mode => 0664, mode => 0664,
} }
git_repo { 'nodejs_repo': vcsrepo { "${base_install_dir}/nodejs":
repo => 'https://github.com/joyent/node.git', ensure => present,
dest => "${base_install_dir}/nodejs", provider => git,
branch => 'v0.6.16-release', source => 'https://github.com/joyent/node.git',
clone_only => 'true', revision => 'origin/v0.6.16-release',
require => Package['git'] require => Package['git']
} }
@ -144,15 +98,15 @@ class etherpad_lite (
Package['libssl-dev'], Package['libssl-dev'],
Package['pkg-config'], Package['pkg-config'],
Package['build-essential'], Package['build-essential'],
Git_repo['nodejs_repo']] Vcsrepo["${base_install_dir}/nodejs"]]
} }
git_repo { 'etherpad_repo': vcsrepo { "${base_install_dir}/etherpad-lite":
repo => 'https://github.com/Pita/etherpad-lite.git', ensure => present,
dest => "${base_install_dir}/etherpad-lite", provider => git,
user => $ep_user, source => "https://github.com/Pita/etherpad-lite.git",
clone_only => 'true', owner => $ep_user,
require => Package['git'] require => Package['git'],
} }
exec { 'install_etherpad_dependencies': exec { 'install_etherpad_dependencies':
@ -161,7 +115,7 @@ class etherpad_lite (
user => $ep_user, user => $ep_user,
cwd => "${base_install_dir}/etherpad-lite", cwd => "${base_install_dir}/etherpad-lite",
environment => "HOME=${base_log_dir}/${ep_user}", environment => "HOME=${base_log_dir}/${ep_user}",
require => [Git_repo['etherpad_repo'], require => [Vcsrepo["${base_install_dir}/etherpad-lite"],
Buildsource["${base_install_dir}/nodejs"]], Buildsource["${base_install_dir}/nodejs"]],
before => File["${base_install_dir}/etherpad-lite/settings.json"], before => File["${base_install_dir}/etherpad-lite/settings.json"],
creates => "${base_install_dir}/etherpad-lite/node_modules" creates => "${base_install_dir}/etherpad-lite/node_modules"