opendev/puppet-openstackci
Code Issues Proposed changes

Include nodepool::mysql from openstackci

Browse Source 
Since mysql stuff was moved from nodepool class
into a dedicated one, nodepool::mysql, it is required
to call it from openstackci::nodepool.

Depends-On: Ic745875b69563ed3834e99533227ca3d1150156b
Change-Id: I9aa710614a86ab8019ec1a3e5bc4cf0a70cab549
This commit is contained in:
Mateusz Matuszkowiak 2016-05-17 22:16:56 +02:00
parent c4cb31d38e
commit 6ed3c0c5b7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/nodepool.pp
View File

@ -35,6 +35,10 @@ class openstackci::nodepool (
$jenkins_masters = [], $jenkins_masters = [],
$build_workers = '1', $build_workers = '1',
$upload_workers = '4', $upload_workers = '4',
$install_mysql = true,
$mysql_db_name = 'nodepool',
$mysql_host = 'localhost',
$mysql_user_name = 'nodepool',
) { ) {
if ! defined(Class['project_config']) { if ! defined(Class['project_config']) {
@ -63,6 +67,10 @@ class openstackci::nodepool (
jenkins_masters => $jenkins_masters, jenkins_masters => $jenkins_masters,
build_workers => $build_workers, build_workers => $build_workers,
upload_workers => $upload_workers, upload_workers => $upload_workers,
install_mysql => $install_mysql,
mysql_db_name => $mysql_db_name,
mysql_host => $mysql_host,
mysql_user_name => $mysql_user_name,
} }
file { '/etc/nodepool/nodepool.yaml': file { '/etc/nodepool/nodepool.yaml':