diff --git a/modules/jenkins/manifests/jenkinsuser.pp b/modules/jenkins/manifests/jenkinsuser.pp
index ec40a1fca4..226addc8cd 100644
--- a/modules/jenkins/manifests/jenkinsuser.pp
+++ b/modules/jenkins/manifests/jenkinsuser.pp
@@ -1,4 +1,4 @@
-define jenkins::jenkinsuser($ensure = present, $sudo = false, $ssh_key) {
+class jenkins::jenkinsuser($ensure = present, $sudo = false, $ssh_key) {
 
   group { 'jenkins':
     ensure => 'present'
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 95ae167039..dbc30ffe60 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -3,7 +3,7 @@ class jenkins::slave($ssh_key, $sudo = false, $bare = false, $user = true) {
     include pip
 
     if ($user == true) {
-      jenkins::jenkinsuser { "jenkins":
+      class { 'jenkins::jenkinsuser':
         ensure => present,
         sudo => $sudo,
         ssh_key => "${ssh_key}"
diff --git a/modules/openstack_project/manifests/init.pp b/modules/openstack_project/manifests/init.pp
index 572149720d..d99ebdec63 100644
--- a/modules/openstack_project/manifests/init.pp
+++ b/modules/openstack_project/manifests/init.pp
@@ -1,6 +1,6 @@
 class openstack_project {
 
-  $jenkins_ssh_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtioTW2wh3mBRuj+R0Jyb/mLt5sjJ8dEvYyA8zfur1dnqEt5uQNLacW4fHBDFWJoLHfhdfbvray5wWMAcIuGEiAA2WEH23YzgIbyArCSI+z7gB3SET8zgff25ukXlN+1mBSrKWxIza+tB3NU62WbtO6hmelwvSkZ3d7SDfHxrc4zEpmHDuMhxALl8e1idqYzNA+1EhZpbcaf720mX+KD3oszmY2lqD1OkKMquRSD0USXPGlH3HK11MTeCArKRHMgTdIlVeqvYH0v0Wd1w/8mbXgHxfGzMYS1Ej0fzzJ0PC5z5rOqsMqY1X2aC1KlHIFLAeSf4Cx0JNlSpYSrlZ/RoiQ== hudson@hudson'
+  $jenkins_ssh_key = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtioTW2wh3mBRuj+R0Jyb/mLt5sjJ8dEvYyA8zfur1dnqEt5uQNLacW4fHBDFWJoLHfhdfbvray5wWMAcIuGEiAA2WEH23YzgIbyArCSI+z7gB3SET8zgff25ukXlN+1mBSrKWxIza+tB3NU62WbtO6hmelwvSkZ3d7SDfHxrc4zEpmHDuMhxALl8e1idqYzNA+1EhZpbcaf720mX+KD3oszmY2lqD1OkKMquRSD0USXPGlH3HK11MTeCArKRHMgTdIlVeqvYH0v0Wd1w/8mbXgHxfGzMYS1Ej0fzzJ0PC5z5rOqsMqY1X2aC1KlHIFLAeSf4Cx0JNlSpYSrlZ/RoiQ== hudson@hudson\n"
 
   $sysadmins = [
     'corvus@inaugust.com',
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index af01f84acc..c78feca129 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -1,13 +1,11 @@
-class openstack_project::static(
-  $ssh_key=$openstack_project::jenkins_ssh_key
-  ) {
+class openstack_project::static() {
 
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [22, 80, 443]
   }
 
   class { 'jenkins::jenkinsuser':
-    ssh_key => $ssh_key
+    ssh_key => $openstack_project::jenkins_ssh_key
   }
 
   include apache