Running, yet not finished, build with Puppet 4.

Puppet 4 Agent/Master are getting provisioned. However the nodes.pp and site.pp are not in place yet. Also, the Puppet 4 Master apperantly needs a lot of memory. There must be a way to cut this down to a reasonable amout.
martialblog · May 19, 2016 · 611b790 · 611b790
1 parent 61c6330
commit 611b790
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 40 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -3,7 +3,8 @@
 
 domain = 'example.com'
 box = 'ubuntu/trusty64'
-ram = 512
+# The Puppet 4 Master seems to need a lot of RAM. Needs to get fixed somehow.
+ram = 2304
 
 puppet_nodes = [
   {:hostname => 'puppet',  :ip => '172.16.32.10', :box => box, :fwdhost => 8140, :fwdguest => 8140, :ram => ram},

diff --git a/provision/modules/puppet/manifests/init.pp b/provision/modules/puppet/manifests/init.pp
@@ -30,12 +30,6 @@
   $service_name = $puppet::params::client_service_name,
 ) inherits puppet::params {
 
-  if $osfamily == 'debian' and $ensure != 'latest' {
-    class { 'puppet::apt_pin':
-      version => $ensure
-    }
-  }
-
   package { $package_name:
     ensure => $ensure,
   }

diff --git a/provision/modules/puppet/manifests/params.pp b/provision/modules/puppet/manifests/params.pp
@@ -17,17 +17,23 @@
   $client_ensure = 'latest'
   $server_ensure = 'latest'
 
-  $client_package_name = 'puppet'
+  # Puppet 3:
+  #$client_package_name = 'puppet'
+  # Puppet 4:
+  $client_package_name = 'puppet-agent'
   $client_service_name = 'puppet'
 
-  $server_service_name = 'puppetmaster'
+  $server_service_name = 'puppetserver'
 
   case $::osfamily {
     'redhat': {
       $server_package_name = 'puppet-server'
     }
     'debian': {
-      $server_package_name = 'puppetmaster'
+      # Puppet 3:
+      #$server_package_name = 'puppetmaster'
+      # Puppet 4:
+      $server_package_name = 'puppetserver'
     }
     default: {
       fail("Module 'puppet' is not currently supported by Puppet Sandbox on ${::operatingsystem}")

diff --git a/provision/modules/puppet/manifests/server.pp b/provision/modules/puppet/manifests/server.pp
@@ -54,39 +54,53 @@
     provider => gem,
   }
 
-  file { 'puppet.conf':
-    path    => '/etc/puppet/puppet.conf',
-    owner   => 'puppet',
-    group   => 'puppet',
-    mode    => '0644',
-    source  => 'puppet:///modules/puppet/puppet.conf',
-    require => Package[ $package_name ],
-    notify  => Service[ $service_name ],
-  }
+  # TODO This isn't working.
+  # Can't seem to get the memory lower without the puppetserver blowing up.
+  # Working setting was Xms2g for the JVM and 2304m for the VM. Jeez!
+  # http://docs.oracle.com/cd/E15523_01/web.1111/e13814/jvm_tuning.htm#PERFM167
+  #
+  # exec { 'puppetserver_java_args':
+  #   command => "/bin/sed -i 's/-Xms2g -Xmx2g/-Xms768m -Xmx1g/g' /etc/default/puppetserver",
+  #   onlyif  => '/usr/bin/test -f /etc/default/puppetserver',
+  #   require => Package[ $package_name ],
+  #   before  => Service[ $service_name ],
+  # }
 
-  file { 'site.pp':
-    path    => '/etc/puppet/manifests/site.pp',
-    owner   => 'puppet',
-    group   => 'puppet',
-    mode    => '0644',
-    source  => 'puppet:///modules/puppet/site.pp',
-    require => Package[ $package_name ],
-  }
+  # TODO Place these files in the right places.
+  #
+  # file { 'puppet.conf':
+  #   path    => '/etc/puppet/puppet.conf',
+  #   owner   => 'puppet',
+  #   group   => 'puppet',
+  #   mode    => '0644',
+  #   source  => 'puppet:///modules/puppet/puppet.conf',
+  #   require => Package[ $package_name ],
+  #   notify  => Service[ $service_name ],
+  # }
 
-  file { 'autosign.conf':
-    path    => '/etc/puppet/autosign.conf',
-    owner   => 'puppet',
-    group   => 'puppet',
-    mode    => '0644',
-    content => '*',
-    require => Package[ $package_name ],
-  }
+  # file { 'site.pp':
+  #   path    => '/etc/puppet/manifests/site.pp',
+  #   owner   => 'puppet',
+  #   group   => 'puppet',
+  #   mode    => '0644',
+  #   source  => 'puppet:///modules/puppet/site.pp',
+  #   require => Package[ $package_name ],
+  # }
 
-  file { '/etc/puppet/manifests/nodes.pp':
-    ensure  => link,
-    target  => '/vagrant/nodes.pp',
-    require => Package[ $package_name ],
-  }
+  # file { 'autosign.conf':
+  #   path    => '/etc/puppet/autosign.conf',
+  #   owner   => 'puppet',
+  #   group   => 'puppet',
+  #   mode    => '0644',
+  #   content => '*',
+  #   require => Package[ $package_name ],
+  # }
+
+  # file { '/etc/puppet/manifests/nodes.pp':
+  #   ensure  => link,
+  #   target  => '/vagrant/nodes.pp',
+  #   require => Package[ $package_name ],
+  # }
 
   # initialize a template file then ignore
   file { '/vagrant/nodes.pp':
@@ -98,6 +112,7 @@
   service { $service_name:
     ensure => running,
     enable => true,
+    require => Package[ $package_name ],
   }
 
 }