Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Added differtiation for 32 and 64bit oracle prereqs #8

Merged
merged 1 commit into from about 2 years ago

2 participants

Fabian Dammekens Kristof Willaert
Fabian Dammekens
Owner

No description provided.

Kristof Willaert willaerk merged commit cd4430e into from March 22, 2012
Kristof Willaert willaerk closed this March 22, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Mar 22, 2012
Fabian Dammekens Added differtiation for 32 and 64bit oracle prereqs b398878
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 8 additions and 7 deletions. Show diff stats Hide diff stats

  1. 15  manifests/init.pp
15  manifests/init.pp
@@ -13,11 +13,11 @@
13 13
 # [Remember: No empty lines between comments and class definition]
14 14
 class oracleprereq {
15 15
 
16  
-  $libpackages = ['compat-libstdc++-33',
17  
-                  'glibc-devel.i386',
18  
-                  'glibc-devel.x86_64',
19  
-                  'glibc-headers',
20  
-                  'libaio',
  16
+  $glibc = $::architecture ? {
  17
+    i386    => ['glibc-devel.i386','glibc-headers'],
  18
+    x86_64  => ['glibc-devel.i386','glibc-devel.x86_64','glibc-headers'],
  19
+  }
  20
+  $libpackages = ['libaio',
21 21
                   'libaio-devel',
22 22
                   'numactl-devel',
23 23
                   'elfutils-libelf-devel',
@@ -29,6 +29,7 @@
29 29
                   'libstdc++-devel',
30 30
                   'gcc',
31 31
                   'gcc-c++',
  32
+                  'compat-libstdc++-33',
32 33
                   'compat-db']
33 34
   $systemtools = ['ksh',
34 35
                   'bind-utils',
@@ -37,10 +38,10 @@
37 38
                   'libgomp',
38 39
                   'unzip',
39 40
                   'sysstat']
40  
-  package { [$libpackages,$buildpackages,$systemtools]:
  41
+  package { [$libpackages,$glibc,$buildpackages,$systemtools]:
41 42
     ensure => present,
42 43
   }
43  
-  package { ["oracleasm-$::kernelrelease",'oracleasmlib','oracleasm-support']:
  44
+  package { ["oracleasm-${::kernelrelease}",'oracleasmlib','oracleasm-support']:
44 45
     ensure => present,
45 46
   }
46 47
 
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.