Skip to content

Commit 4354a39

Browse files
cdelgehierracciari
authored andcommitted
Allow Golang RAWX
1 parent 8af9f9e commit 4354a39

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

manifests/params.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
}
5353
$libdir = "${prefixdir}/lib"
5454
$httpd_daemon = '/usr/sbin/apache2'
55+
$rawx_go_daemon = '/bin/oio-rawx'
5556
$httpd_moduledir = "${libdir}/apache2/modules"
5657
$httpd_package_name = ['openio-sds']
5758
$package_names = ['openio-sds']
@@ -79,6 +80,7 @@
7980
}
8081
}
8182
$httpd_daemon = '/usr/sbin/httpd'
83+
$rawx_go_daemon = '/bin/oio-rawx'
8284
$httpd_moduledir = "${libdir}/httpd/modules"
8385
$httpd_package_name = ['openio-sds-mod-httpd']
8486
$package_names = ['openio-sds-server']

manifests/rawx.pp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
$location = $hostname,
2525
$slots = undef,
26+
$golang_version = false,
2627
$no_exec = false,
2728
) {
2829

@@ -53,6 +54,7 @@
5354
validate_integer($grid_hash_width)
5455
validate_string($location)
5556
if $slots { validate_array($slots) }
57+
validate_bool($golang_version)
5658

5759
# Namespace
5860
if $action == 'create' {
@@ -86,7 +88,10 @@
8688
# Init
8789
gridinit::program { "${ns}-${type}-${num}":
8890
action => $action,
89-
command => "${openiosds::httpd_daemon} -D FOREGROUND -f ${openiosds::sysconfdir}/${ns}/${type}-${num}/${type}-${num}-httpd.conf",
91+
command => $golang_version ? {
92+
true => "${openiosds::rawx_go_daemon} -D FOREGROUND -f ${openiosds::sysconfdir}/${ns}/${type}-${num}/${type}-${num}-httpd.conf",
93+
false => "${openiosds::httpd_daemon} -D FOREGROUND -f ${openiosds::sysconfdir}/${ns}/${type}-${num}/${type}-${num}-httpd.conf",
94+
},
9095
group => "${ns},${type},${type}-${num}",
9196
uid => $openiosds::user,
9297
gid => $openiosds::group,

0 commit comments

Comments
 (0)