From 0d52dff2dcfd4b2805e75690df6909f663aaa9bd Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sun, 19 May 2013 17:44:46 +0000 Subject: [PATCH] No longer include mysql::server for dashboard. * 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 Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- modules/openstack_project/manifests/dashboard.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/openstack_project/manifests/dashboard.pp b/modules/openstack_project/manifests/dashboard.pp index 144aff56c8..e08fcd4c1c 100644 --- a/modules/openstack_project/manifests/dashboard.pp +++ b/modules/openstack_project/manifests/dashboard.pp @@ -3,7 +3,6 @@ class openstack_project::dashboard( $mysql_password = '', $sysadmins = [] ) { - include mysql::server class { 'openstack_project::server': iptables_public_tcp_ports => [80, 443, 3000], @@ -26,9 +25,8 @@ class openstack_project::dashboard( file { '/etc/mysql/conf.d/mysqld_innodb_fpt.cnf': ensure => present, source => - 'puppet://modules/openstack_project/dashboard/mysqld_innodb_fpt.cnf', + 'puppet:///modules/openstack_project/dashboard/mysqld_innodb_fpt.cnf', require => Class['mysql::server'], - notify => Service['mysql'], } }