diff options
author | mail_redacted_for_web | 2016-01-05 13:27:26 -0800 |
---|---|---|
committer | mail_redacted_for_web | 2016-01-05 13:27:26 -0800 |
commit | 9a876a61e730f1c17063ad0593c3b37625503b5e (patch) | |
tree | c93741be83ef640c860297e0efe3bbb3d86bfca6 /scripts/config_version.sh | |
parent | a9d3be58aa816a0b909efa05cbb714c0e94c21be (diff) | |
parent | 752f2ef87bb56895f5a63c89fd01fe0ed0c623be (diff) | |
download | control-repo-template-9a876a61e730f1c17063ad0593c3b37625503b5e.tar.bz2 |
Merge pull request #9 from npwalker/2015_3_prep
Changes for PE2015.3.0
Diffstat (limited to 'scripts/config_version.sh')
-rwxr-xr-x | scripts/config_version.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/config_version.sh b/scripts/config_version.sh index b4e6556..bc77213 100755 --- a/scripts/config_version.sh +++ b/scripts/config_version.sh @@ -1,5 +1,8 @@ #!/bin/bash -if [ -e /opt/puppetlabs/server/pe_version ] +if [ -e $1/$2/.r10k-deploy.json ] +then + /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/code_manager_config_version.rb $1 $2 +elif [ -e /opt/puppetlabs/server/pe_version ] then /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 else |