From 86cf24534d456323b46f480dda21d2d2e47df8f8 Mon Sep 17 00:00:00 2001 From: Edwin Biemond Date: Wed, 4 Feb 2015 17:29:29 +0100 Subject: [PATCH] box fixes --- wls12c-centos-standalone/Vagrantfile | 17 +++++-- .../puppet/manifests/site.pp | 48 +++++++++---------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/wls12c-centos-standalone/Vagrantfile b/wls12c-centos-standalone/Vagrantfile index 67dd342..cbfbc74 100644 --- a/wls12c-centos-standalone/Vagrantfile +++ b/wls12c-centos-standalone/Vagrantfile @@ -10,11 +10,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # please see the online documentation at vagrantup.com. # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "centos-6.4-x86_64" - + config.vm.box = "centos-6.6-x86_64" + # The url from where the 'config.vm.box' box will be fetched if it # doesn't already exist on the user's system. - config.vm.box_url = "https://dl.dropboxusercontent.com/s/yg9ceak6zd86wk7/centos-6.4-x86_64.box" + config.vm.box_url = "https://dl.dropboxusercontent.com/s/ijt3ppej789liyp/centos-6.6-x86_64.box" + + config.vm.provider :vmware_fusion do |v, override| + override.vm.box = "centos-6.6-x86_64-vmware" + override.vm.box_url = "https://dl.dropboxusercontent.com/s/7ytmqgghoo1ymlp/centos-6.6-x86_64-vmware.box" + end # Create a forwarded port mapping which allows access to a specific port # within the machine from a port on the host machine. In the example below, @@ -46,12 +51,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # backing providers for Vagrant. These expose provider-specific options. # Example for VirtualBox: # + config.vm.provider :vmware_fusion do |vb| + vb.vmx["memsize"] = "3072" + end + config.vm.provider :virtualbox do |vb| # # Don't boot with headless mode # vb.gui = true # # Use VBoxManage to customize the VM. For example to change memory: - vb.customize ["modifyvm", :id, "--memory", "4048"] + vb.customize ["modifyvm", :id, "--memory", "3072"] end # # View the documentation for the provider you're using for more diff --git a/wls12c-centos-standalone/puppet/manifests/site.pp b/wls12c-centos-standalone/puppet/manifests/site.pp index 3900d2c..1f22724 100644 --- a/wls12c-centos-standalone/puppet/manifests/site.pp +++ b/wls12c-centos-standalone/puppet/manifests/site.pp @@ -6,8 +6,8 @@ # node 'vagrantcentos64' { - - include os2, wls12, wls12c_domain, orautils + + include os2, wls12, wls12c_domain Class['os2'] -> Class['wls12'] -> Class['wls12c_domain'] -> Class['orautils'] } @@ -24,9 +24,9 @@ include jdk7 jdk7::install7{ 'jdk1.7.0_51': - version => "7u51" , + version => "7u51" , fullVersion => "jdk1.7.0_51", - alternativesPriority => 18000, + alternativesPriority => 18000, x64 => true, downloadDir => "/data/install", urandomJavaFix => true, @@ -64,7 +64,7 @@ sysctl { 'net.core.wmem_max': ensure => 'present', permanent => 'yes', value => '1048576',} # create a swapfile and it to fstab - + exec { "create swap file": command => "/bin/dd if=/dev/zero of=/var/swap.1 bs=1M count=8192", creates => "/var/swap.1", @@ -83,10 +83,10 @@ user => root, unless => "/bin/grep '^/var/swap.1' /etc/fstab 2>/dev/null", } - - + + # turn off iptables - + service { iptables: enable => false, ensure => false, @@ -113,13 +113,13 @@ version => '1212', mdwHome => $osMdwHome, oracleHome => $osOracleHome, - fullJDKName => $jdkWls12cJDK, + fullJDKName => $jdkWls12cJDK, user => $user, - group => $group, + group => $group, downloadDir => $downloadDir, - puppetDownloadMntPoint => $puppetDownloadMntPoint, + puppetDownloadMntPoint => $puppetDownloadMntPoint, } -} +} class wls12c_domain{ @@ -140,7 +140,7 @@ $user = "oracle" $group = "dba" $downloadDir = "/data/install" - $logDir = "/data/logs" + $logDir = "/data/logs" $userConfigDir = '/home/oracle' @@ -149,10 +149,10 @@ version => "1212", wlHome => $osWlHome, mdwHome => $osMdwHome, - fullJDKName => $jdkWls12gJDK, + fullJDKName => $jdkWls12gJDK, user => $user, - group => $group, - downloadDir => $downloadDir, + group => $group, + downloadDir => $downloadDir, wlsTemplate => $osTemplate, domain => $wlsDomainName, adminListenPort => $adminListenPort, @@ -164,24 +164,24 @@ Wls::Nodemanager { wlHome => $osWlHome, - fullJDKName => $jdkWls12gJDK, + fullJDKName => $jdkWls12gJDK, user => $user, group => $group, - serviceName => $serviceName, + serviceName => $serviceName, } - #nodemanager starting + #nodemanager starting # in 12c start it after domain creation wls::nodemanager{'nodemanager12c': version => "1212", listenPort => $nodemanagerPort, - domain => $wlsDomainName, + domain => $wlsDomainName, require => Wls::Wlsdomain['wlsDomain12c'], } - + orautils::nodemanagerautostart{"autostart ${wlsDomainName}": version => "1212", - wlHome => $osWlHome, + wlHome => $osWlHome, user => $user, domain => $wlsDomainName, logDir => $logDir, @@ -195,7 +195,7 @@ wlsServer => "AdminServer", action => 'start', wlHome => $osWlHome, - fullJDKName => $jdkWls12gJDK, + fullJDKName => $jdkWls12gJDK, wlsUser => "weblogic", password => "welcome1", address => $address, @@ -203,7 +203,7 @@ user => $user, group => $group, downloadDir => $downloadDir, - logOutput => true, + logOutput => true, require => Wls::Nodemanager['nodemanager12c'], }