Deploy new PE related changes

.fixtures.yml

@@ -1,9 +1,6 @@
 # Fixtures needed for puppetlabs_spec_helper
 fixtures:
   repositories:
-    r10k:
-      repo: 'git://github.com/acidprime/r10k.git'
-      ref: 'v1.0.2'
     yamlfile:
       repo: 'git://github.com/reidmv/puppet-module-yamlfile.git'
     filemapper:
@@ -28,6 +25,9 @@ fixtures:
     stdlib:
       repo: 'puppetlabs/stdlib'
       ref: '4.1.0'
+    r10k:
+      repo: 'zack/r10k'
+      ref: '2.7.3'
     ruby:
       repo: 'puppetlabs/ruby'
       ref: '0.2.0'

Puppetfile

@@ -1,7 +1,7 @@
 forge "http://forge.puppetlabs.com"
 
 # Install and manage r10k
-mod "zack/r10k", '1.0.2'
+mod "zack/r10k", '2.7.3'
 
 # Deps for zack/r10k
 # We are tracking stdlib from git because the puppet module tool

dist/profile/manifests/puppetmaster.pp

@@ -14,10 +14,7 @@
     group  => 'root',
     mode   => '0644',
     source => "puppet:///modules/${module_name}/hiera.yaml",
-    # The `pe-httpd` service resource is defined in the Puppet master catalog
-    # itself (due to classification in PE Console), therefore you won't find
-    # any declaration of that resource in this codebase
-    notify => Service['pe-httpd'],
+    notify => Service['pe-puppetserver'],
   }
 
   ## Ensure we're setting the right SMTP server. The Puppetmaster is located in
@@ -27,7 +24,7 @@
     target => '/etc/puppetlabs/console-auth/config.yml',
     key    => 'smtp/address',
     value  => 'smtp.osuosl.org',
-    notify => Service['pe-httpd'],
+    notify => Service['pe-puppetserver'],
   }
 
 
@@ -37,7 +34,7 @@
     section => 'master',
     setting => 'reports',
     value   => 'console,puppetdb,irc',
-    notify  => Service['pe-httpd'],
+    notify  => Service['pe-puppetserver'],
   }
 
   firewall { '010 allow dashboard traffic':
@@ -57,4 +54,10 @@
     port   => 8140,
     action => 'accept',
   }
+
+  service { 'pe-puppetserver':
+    ensure     => running,
+    hasrestart => true,
+    hasstatus  => true,
+  }
 }