opendev
/
puppet-drupal
Code Issues Proposed changes

Remove explicit mysql-client installation 

This patch removes the explicit installation of the mysql-client package because:

 - when using the older mysql module it is unnecessary, as the
   mysql::db type requires the mysql::server class, which installs the
   mysql-server package, which installs the mysql-client package as a
   side effect. This is only true for Ubuntu, but as this module only
   works on Ubuntu currently we do not need to be concerned with how
   other operating systems behave.
 - when using a modern mysql module, the mysql::db type includes the
   mysql::client class, which installs the mysql-client package
   explicitly. This conflicts with the explicit installation in the
   drupal module.

This patch will allow the drupal module to work with an up-to-date
version of the mysql module while not causing any negative effects
while the older version is still installed.

Change-Id: Ia472dafdf60b9f1b813d4fc9a6c42f9259f1e203
This commit is contained in:
Colleen Murphy 2015-10-15 13:27:53 -07:00
parent 32eb6d3284
commit 179d0f5544
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -183,7 +183,7 @@ class drupal (
# php packages
$drupal_related_packages = [ 'unzip', 'php5-mysql', 'php5-gd', 'php5-cli',
'libapache2-mod-php5', 'mysql-client' ]
'libapache2-mod-php5' ]
package { $drupal_related_packages:
ensure => 'installed',