opendev/system-config
Code Issues Proposed changes

No longer include mysql::server for dashboard.

Browse Source 
* modules/openstack_project/manifests/dashboard.pp: The dashboard
module already includes mysql::server, so removing it here to get
rid of the duplicate declaration error. The mysql:server module
already subscribes to the conf.d directory, thus removal of the
redundant notify which otherwise ends in a circular dependency
graph. The puppet:/// URL is also correct now.

Change-Id: If1117375b9900e90eab5f7ba3335563991571682
Reviewed-on: https://review.openstack.org/29716
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2013-05-19 17:44:46 +00:00 committed by Jenkins
parent b8e8e502cf
commit 0d52dff2dc
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/dashboard.pp
View File

@ -3,7 +3,6 @@ class openstack_project::dashboard(
$mysql_password = '', $mysql_password = '',
$sysadmins = [] $sysadmins = []
) { ) {
include mysql::server
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443, 3000], iptables_public_tcp_ports => [80, 443, 3000],
@ -26,9 +25,8 @@ class openstack_project::dashboard(
file { '/etc/mysql/conf.d/mysqld_innodb_fpt.cnf': file { '/etc/mysql/conf.d/mysqld_innodb_fpt.cnf':
ensure => present, ensure => present,
source => source =>
'puppet://modules/openstack_project/dashboard/mysqld_innodb_fpt.cnf', 'puppet:///modules/openstack_project/dashboard/mysqld_innodb_fpt.cnf',
require => Class['mysql::server'], require => Class['mysql::server'],
notify => Service['mysql'],
} }
} }