diff options
| author | mail_redacted_for_web | 2015-08-03 17:05:06 -0700 |
|---|---|---|
| committer | mail_redacted_for_web | 2015-08-03 17:05:06 -0700 |
| commit | f5cb1fa75796327cefe8054efeab855c143ef2e3 (patch) | |
| tree | 03d15ad055772110183abc70efec2df89645d716 | |
| parent | 437433ff44cd77915a4a7b1d61d7aa624c44b41a (diff) | |
| download | control-repo-template-f5cb1fa75796327cefe8054efeab855c143ef2e3.tar.bz2 | |
Update config_version to use a script that does not require git
The config_version now uses a script that will do one of two
things:
1. call config_version.rb which uses rugged to find the information
about the latest commit if PE is on version 2015.2 or newer
2. make a call to git if the PE version is less than 2015.2
| -rw-r--r-- | environment.conf | 2 | ||||
| -rw-r--r-- | scripts/config_version.rb | 17 | ||||
| -rw-r--r-- | scripts/config_version.sh | 7 |
3 files changed, 25 insertions, 1 deletions
diff --git a/environment.conf b/environment.conf index a1579ce..6d60708 100644 --- a/environment.conf +++ b/environment.conf @@ -1,5 +1,5 @@ modulepath = modules:site:$basemodulepath -config_version = '/usr/bin/git --git-dir $confdir/environments/$environment/.git rev-parse HEAD' +config_version = 'scripts/config_version.sh $environmentpath $environment' # Environment timeout should be set to unlimited. When set to zero it is less performant. # When code is deployed the admin API of puppetserver should be used to force a refresh of code from disk. diff --git a/scripts/config_version.rb b/scripts/config_version.rb new file mode 100644 index 0000000..52f32c5 --- /dev/null +++ b/scripts/config_version.rb @@ -0,0 +1,17 @@ +require 'rugged' + +environmentpath = ARGV[0] +environment = ARGV[1] + +repo = Rugged::Repository.discover(File.join(environmentpath, environment)) +head = repo.head + +#sha1 hash of the newest commit +head_sha = head.target_id + +#the commit message associated the newest commit +commit = repo.lookup(head_sha) + +#add something to find the remote url + +puts head_sha diff --git a/scripts/config_version.sh b/scripts/config_version.sh new file mode 100644 index 0000000..1f42d34 --- /dev/null +++ b/scripts/config_version.sh @@ -0,0 +1,7 @@ +#!/bin/bash +if [ -e /opt/puppetlabs/server/pe_version ] +then + /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 +else + /usr/bin/git --git-dir $codedir/environments/$environment/.git rev-parse HEAD +fi |