Merge pull request #366 from andrewklau/foreman_fixes

Clean up to avoid unnecessary notices and service restarts

Author: sdodson

manifests/broker.pp

@@ -104,6 +104,9 @@
       '/var/www/openshift/broker/httpd/run',
       '/var/www/openshift/broker/tmp',
       '/var/www/openshift/broker/tmp/cache',
+      '/var/www/openshift/broker/tmp/sessions',
+      '/var/www/openshift/broker/tmp/pids',
+      '/var/www/openshift/broker/tmp/sockets',
     ]:
     ensure  => directory,
   }
@@ -192,6 +195,12 @@
     $quickstart_content = ''
   }
 
+  exec {'clear console cache':
+    refreshonly => true,
+    subscribe   => File['quickstarts'],
+    command     => 'oo-admin-console-cache --clear',
+  }
+  
   file { 'quickstarts':
     ensure  => present,
     path    => '/etc/openshift/quickstarts.json',
@@ -248,29 +257,32 @@
   $broker_bundle_show = 'LD_LIBRARY_PATH=/opt/rh/ruby193/root/usr/lib64 GEM_PATH=/opt/rh/ruby193/root/usr/local/share/gems:/opt/rh/ruby193/root/usr/share/gems /opt/rh/ruby193/root/usr/bin/bundle show'
 
   exec { 'Broker gem dependencies':
-    cwd     => '/var/www/openshift/broker/',
-    command => "rm -f Gemfile.lock && ${broker_bundle_show}",
-    before  => File['/var/www/openshift/broker/tmp'],
-    require => [
+    cwd         => '/var/www/openshift/broker/',
+    command     => "rm -f Gemfile.lock && ${broker_bundle_show}",
+    before      => File['/var/www/openshift/broker/tmp'],
+    require     => [
       Package['openshift-origin-broker'],
       File['openshift broker.conf','mcollective broker plugin config'],
     ],
-    notify  => [
+    notify      => [
       Service['openshift-broker'],
       File['/var/www/openshift/broker/Gemfile.lock'],
     ],
+    subscribe   => Package['openshift-origin-broker'],
+    refreshonly => true,
   }
 
   # This File resource is to guarantee that the Gemfile.lock created
   # by the subscribed Exec has the appropriate permissions (otherwise
   # it is created as owned by root:root)
   file { '/var/www/openshift/broker/Gemfile.lock':
-    ensure    => present,
-    owner     => 'apache',
-    group     => 'apache',
-    mode      => '0644',
-    require   => Package['openshift-origin-broker','httpd'],
-    subscribe => Exec['Broker gem dependencies'],
+    ensure                  => present,
+    owner                   => 'apache',
+    group                   => 'apache',
+    mode                    => '0644',
+    selinux_ignore_defaults => true,
+    require                 => Package['openshift-origin-broker','httpd'],
+    subscribe               => Exec['Broker gem dependencies'],
   }
 
   service { 'openshift-broker':

manifests/cartridges/jenkins.pp

@@ -18,6 +18,8 @@
     require => Class['openshift_origin::install_method'],
   }
   exec { '/usr/bin/yum versionlock jenkins':
-    require => Package['jenkins', 'yum-plugin-versionlock'],
+    require     => Package['jenkins', 'yum-plugin-versionlock'],
+    subscribe   => Package['jenkins'],
+    refreshonly => true,
   }
 }

manifests/console.pp

@@ -112,11 +112,12 @@
   # by the following Exec has the appropriate permissions (otherwise
   # it is created as owned by root:root)
   file { '/var/www/openshift/console/Gemfile.lock':
-    ensure  => 'present',
-    owner   => 'apache',
-    group   => 'apache',
-    mode    => '0644',
-    require => Package['openshift-origin-console','httpd'],
+    ensure                  => 'present',
+    owner                   => 'apache',
+    group                   => 'apache',
+    mode                    => '0644',
+    selinux_ignore_defaults => true,
+    require                 => Package['openshift-origin-console','httpd'],
   }
 
   # SCL and Puppet don't play well together; the 'default' here
@@ -143,10 +144,11 @@
   }
 
   exec { 'restorecon console dir':
-    command  => 'restorecon -R /var/www/openshift/console',
-    provider => 'shell',
-    require  => Package['openshift-origin-console'],
-    notify   => Service['openshift-console'],
+    command     => 'restorecon -R /var/www/openshift/console',
+    provider    => 'shell',
+    require     => Package['openshift-origin-console'],
+    notify      => Service['openshift-console'],
+    refreshonly => true,
   }
 
   service { 'openshift-console':

manifests/selbooleans/broker_console.pp

@@ -14,9 +14,11 @@
     persistent => true,
   }
   exec { 'Broker / Console restorecon commands':
-    command => template('openshift_origin/selinux/broker_console_restorecons.erb'),
-    require => Package['openshift-origin-broker','openshift-origin-console'],
-    notify  => Service['openshift-broker'],
-    timeout => 1800,
+    command     => template('openshift_origin/selinux/broker_console_restorecons.erb'),
+    subscribe   => Package['openshift-origin-broker','openshift-origin-console'],
+    require     => Package['openshift-origin-broker','openshift-origin-console'],
+    notify      => Service['openshift-broker'],
+    timeout     => 1800,
+    refreshonly => true,
   }
 }

manifests/selbooleans/node.pp

@@ -9,11 +9,16 @@
     persistent => true,
   }
   exec { 'node restorecon commands':
-    command => 'restorecon -rv /var/run; restorecon -rv /var/lib/openshift /etc/openshift/node.conf',
-    timeout => 1800,
-    require => [
+    command     => 'restorecon -rv /var/run; restorecon -rv /var/lib/openshift /etc/openshift/node.conf',
+    timeout     => 1800,
+    refreshonly => true,
+    subscribe   => [
       Package['rubygem-openshift-origin-node'],
       File['openshift node config'],
-    ]
+    ],
+    require     => [
+      Package['rubygem-openshift-origin-node'],
+      File['openshift node config'],
+    ],
   }
 }