Andrew Bogott has submitted this change and it was merged. Change subject: Modest changes in the wikitech config for Trusty ......................................................................
Modest changes in the wikitech config for Trusty Change-Id: I9dc36727f841c443dc8eabf93c7c049eef61a564 --- M modules/openstack/manifests/openstack-manager.pp 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/manifests/openstack-manager.pp b/modules/openstack/manifests/openstack-manager.pp index dd68097..e31f03f 100644 --- a/modules/openstack/manifests/openstack-manager.pp +++ b/modules/openstack/manifests/openstack-manager.pp @@ -24,8 +24,14 @@ $controller_hostname = $novaconfig['controller_hostname'] - package { [ 'php5-ldap', 'php5-uuid', 'imagemagick', 'librsvg2-bin' ]: - ensure => present; + if ($::lsbdistcodename == 'precise') { + package { [ 'php5-ldap', 'php5-uuid', 'imagemagick', 'librsvg2-bin' ]: + ensure => present; + } + } else { + package { [ 'php5-ldap', 'imagemagick', 'librsvg2-bin' ]: + ensure => present; + } } $webserver_hostname = $::realm ? { -- To view, visit https://gerrit.wikimedia.org/r/188111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9dc36727f841c443dc8eabf93c7c049eef61a564 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits