summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel de Medeiros Queiroz <samueldmq@gmail.com>2015-09-16 11:09:29 -0300
committerSamuel de Medeiros Queiroz <samueldmq@gmail.com>2015-09-16 12:19:08 -0300
commit957ecb6ceffd3180bc6c53b2abf77eddc3090b9d (patch)
tree219b8ba18022cda25d7873e75142b1ca9ae11848
parent72177180db626658104251d171ce6ef8ac6c9d70 (diff)
Ensure abiword package is always present
Change I9831526581a5fc1f2014c9985637664c79b937bf moved the required packages list statement into a conditional block, making it to be ensured only in the case nodejs_version was set to 'system'. This was causing the abiword library to not be installed and then etherpad.o.o was appending the following error message to new pads: Error: Abiword does not exist at this path, check your settings file -- To suppress these warning messages change suppressErrorsInPadText to true in your settings.json This patch makes the abiword library to always be installed by moving it out of that conditional statement. Change-Id: I50f55e4408d850b2bf449b121b9014d511518481
Notes
Notes (review): Code-Review+1: Clint Adams <clint@gcfm.net> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+1: Ronald Bradford <ronald.bradford@gmail.com> Code-Review+2: Elizabeth K. Joseph <lyz@princessleia.com> Workflow+1: Elizabeth K. Joseph <lyz@princessleia.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 17 Sep 2015 20:52:12 +0000 Reviewed-on: https://review.openstack.org/224103 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--manifests/init.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 08cdfce..64e377d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -45,6 +45,10 @@ class etherpad_lite (
45 mode => '0664', 45 mode => '0664',
46 } 46 }
47 47
48 package { 'abiword':
49 ensure => present,
50 }
51
48 if ($nodejs_version != 'system') { 52 if ($nodejs_version != 'system') {
49 vcsrepo { "${base_install_dir}/nodejs": 53 vcsrepo { "${base_install_dir}/nodejs":
50 ensure => present, 54 ensure => present,
@@ -63,7 +67,6 @@ class etherpad_lite (
63 'python', 67 'python',
64 'libssl-dev', 68 'libssl-dev',
65 'pkg-config', 69 'pkg-config',
66 'abiword',
67 'build-essential', 70 'build-essential',
68 ]: 71 ]:
69 ensure => present, 72 ensure => present,