Skip to content

Commit 9f68a0e

Browse files
committed
Merge pull request 'feat: pin all the openvox agent to v1.1.1 linuxaid' (#1358) from g10k_puppetfile into master
Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1358
2 parents 6984151 + 748d7bd commit 9f68a0e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bin/get_environment_commit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GITDIR="${ENVROOT}/${1}/.git"
1212
# check to make sure the env repo exists
1313
if [ -d "${GITDIR}" ];
1414
then
15-
git --git-dir "${GITDIR}" rev-parse --short HEAD
15+
"${1}:$(git --git-dir "${GITDIR}" rev-parse --short HEAD)"
1616
else
1717
date '+%s'
1818
fi

modules/enableit/common/manifests/openvox.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
Optional[Hash] $extra_main_settings = undef,
2727

2828
# TODO: lets control via enc script
29-
String $environment = 'master',
29+
String $environment = 'v1.1.1',
3030
) {
3131

3232
if $manage {

modules/enableit/profile/manifests/openvox.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
'onetime' => false,
138138
'certname' => $::trusted['certname'],
139139
'manage_internal_file_permissions' => false,
140-
'environment' => $environment,
140+
'environment' => regsubst($environment, '\.', '_', 'G'),
141141
'runtimeout' => '10m',
142142
'masterport' => $server_port,
143143
'extra_main_settings' => $extra_main_settings,

0 commit comments

Comments
 (0)