Merge pull request #345 from sdodson/bz1161486

Create /etc/openshift/development when development_mode = true

Author: sdodson

files/development

@@ -0,0 +1 @@
+Created by puppet

manifests/broker.pp

@@ -226,6 +226,13 @@
       notify  => Service['openshift-broker'],
     }
   }
+  file { '/etc/openshift/development':
+    source  => 'puppet:///openshift_origin/development',
+    ensure  => $::openshift_origin::development_mode ? {
+        true    => present,
+        default => absent,
+      }
+  }
 
   # SCL and Puppet don't play well together; the 'default' here
   # circumvents the use of the `scl enable ruby193` mechanism
@@ -267,6 +274,7 @@
     hasstatus  => true,
     hasrestart => true,
     require    => Package['openshift-origin-broker'],
+    subscribe  => File['/etc/openshift/development'],
   }
   exec { 'Remove mod_ssl default vhost':
     command => '/bin/sed -i \'/VirtualHost/,/VirtualHost/ d\' /etc/httpd/conf.d/ssl.conf',

manifests/console.pp

@@ -162,5 +162,6 @@
     enable     => true,
     hasstatus  => true,
     hasrestart => true,
+    subscribe  => File['/etc/openshift/development'],
   }
 }