Merge "add nodepool to jenkins-dev server"

modules/openstack_project/manifests/jenkins_dev.pp

@@ -2,7 +2,16 @@
 #
 class openstack_project::jenkins_dev (
   $jenkins_ssh_private_key = '',
-  $sysadmins = []
+  $sysadmins = [],
+  $mysql_root_password,
+  $mysql_password,
+  $nodepool_ssh_private_key = '',
+  $jenkins_api_user ='',
+  $jenkins_api_key ='',
+  $jenkins_credentials_id ='',
+  $hpcloud_username ='',
+  $hpcloud_password ='',
+  $hpcloud_project ='',
 ) {
   include openstack_project
 
@@ -33,4 +42,19 @@ class openstack_project::jenkins_dev (
     mode   => '0644',
     source => 'puppet:///modules/openstack_project/jenkins/jenkins.default',
   }
+
+  class { '::nodepool':
+    mysql_password           => 'mysql_password',
+    mysql_root_password      => 'mysql_root_password',
+    nodepool_ssh_private_key => 'nodepool_ssh_private_key',
+    nodepool_template        => 'nodepool-dev.yaml.erb',
+    sysadmins                => 'sysadmins',
+    jenkins_api_user         => 'jenkins_api_user',
+    jenkins_api_key          => 'jenkins_api_key',
+    jenkins_credentials_id   => 'jenkins_credentials_id',
+    hpcloud_username         => 'hpcloud_username',
+    hpcloud_password         => 'hpcloud_password',
+    hpcloud_project          => 'hpcloud_project',
+  }
+
 }

modules/openstack_project/manifests/nodepool.pp

@@ -4,6 +4,7 @@ class openstack_project::nodepool(
   $mysql_root_password,
   $mysql_password,
   $nodepool_ssh_private_key = '',
+  $nodepool_template = 'nodepool.yaml.erb',
   $sysadmins = [],
   $statsd_host = '',
   $jenkins_api_user ='',
@@ -35,7 +36,7 @@ class openstack_project::nodepool(
     owner   => 'nodepool',
     group   => 'root',
     mode    => '0400',
-    content => template('openstack_project/nodepool/nodepool.yaml.erb'),
+    content => template("openstack_project/nodepool/${nodepool_template}"),
     require => [
       File['/etc/nodepool'],
       User['nodepool'],