Merge pull request #332 from TLmaK0/master
Get architecture when no os/architecture exists
This commit is contained in:
@@ -206,12 +206,17 @@ define java::oracle (
|
|||||||
}
|
}
|
||||||
|
|
||||||
# set java architecture nomenclature
|
# set java architecture nomenclature
|
||||||
case $facts['os']['architecture'] {
|
$os_architecture = $facts['os']['architecture'] ? {
|
||||||
|
undef => $facts['architecture'],
|
||||||
|
default => $facts['os']['architecture']
|
||||||
|
}
|
||||||
|
|
||||||
|
case $os_architecture {
|
||||||
'i386' : { $arch = 'i586' }
|
'i386' : { $arch = 'i586' }
|
||||||
'x86_64' : { $arch = 'x64' }
|
'x86_64' : { $arch = 'x64' }
|
||||||
'amd64' : { $arch = 'x64' }
|
'amd64' : { $arch = 'x64' }
|
||||||
default : {
|
default : {
|
||||||
fail ("unsupported platform ${$facts['os']['architecture']}")
|
fail ("unsupported platform ${$os_architecture}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user