From 56d0908db2919fc9734a7722ece4adaa9d7b9bdc Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 14 Dec 2015 16:28:13 -0800 Subject: Update config_version to read r10k_deploy.json file Update config_version.sh to read the r10k_deploy.json file if it exists. If it does not exist it will fall back to the existing logic --- scripts/config_version.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/config_version.sh') 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 -- cgit v1.2.3