x
/
fuel-plugin-influxdb-grafana
Code Issues Proposed changes

Fix InfluxDB install when systemd is present 

The influxdb package fails to install on Trusty machines because
while systemd is now installed, it isn't running as the init system.
This change installs the systemd-shim package to get rid of the issue.

Change-Id: I571f923c877e723f74a39691e69df8957d21e95d
Closes-Bug: #1652640
This commit is contained in:
Simon Pasquier 2017-01-03 16:42:32 +01:00
parent 768d468bf8
commit 5f57e8dbe8
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment_scripts/puppet/manifests/hiera.pp
View File

@ -14,6 +14,16 @@
notice('fuel-plugin-influxdb-grafana: hiera.pp')
if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '14.04' {
# This is required to install the InfluxDB package on Trusty machines that
# have systemd installed. The systemctl-shim package will force the removal
# of the systemd package.
# See https://bugs.launchpad.net/lma-toolchain/+bug/1652640 for details
package { 'systemd-shim':
ensure => present,
}
}
$fuel_version = 0 + hiera('fuel_version')
# Initialize network-related variables

1
pre_build_hook
View File

@ -13,6 +13,7 @@ FIREWALL_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-firewa
download_package https://s3.amazonaws.com/influxdb/influxdb_0.11.1-1_amd64.deb
download_package https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.4-1464167696_amd64.deb
download_package http://mirrors.kernel.org/ubuntu/pool/main/s/systemd-shim/systemd-shim_6-2bzr1_amd64.deb
# Download Puppet modules
download_puppet_module "grafana" "$GRAFANA_TARBALL_URL"