Download as
Browse Code »

Commit 9d9ca5f64ec1aa4158e272602fde6eda2248da77

Authored by Sergio Oliveira
1 parent 9dc8f2e1
Exists in master and in 13 other branches Validation_colab_sprint_30, check-port, generic-plugins, header_footer, mezuro-integration, move_out_plugins, plugin_extra_configs, proxy_base_template, proxy_hotspot, spb-release/3.0, stable, test, trac_indexing

Added pyOpenSSL deps. Closes #15

Showing 1 changed file with 13 additions and 5 deletions   Show diff stats
puppet/modules/colab/manifests/init.pp
  Diff comments   View file @9d9ca5f
... ... @@ -22,24 +22,32 @@ class colab (
22 22 proxy_hosts => $colab::hostnames,
23 23 }
24 24  
  25 + $package_defaults = {
  26 + before => Pip::Install['pyOpenSSL'],
  27 + }
  28 +
25 29 case $osfamily {
  30 +
26 31 'Redhat': {
27   - ensure_packages(['java-1.7.0-openjdk','fuse-sshfs'])
  32 + ensure_packages(['java-1.7.0-openjdk', 'fuse-sshfs', 'libffi-devel'],
  33 + $package_defaults)
28 34 }
29 35 'Debian': {
30   - ensure_packages(['openjdk-7-jre','sshfs'])
  36 + ensure_packages(['openjdk-7-jre', 'sshfs', 'libffi-dev'], $package_defaults)
31 37 }
32 38 }
33 39  
34 40 ensure_packages(['memcached'])
35 41  
36   - # XMPP connection manager
37   - pip::install { 'punjab': }
38   -
39 42 # Punjab dep
40 43 pip::install { 'Twisted': }
41 44 pip::install { 'pyOpenSSL': }
42 45  
  46 + # XMPP connection manager
  47 + pip::install { 'punjab':
  48 + require => Pip::Install['Twisted', 'pyOpenSSL'],
  49 + }
  50 +
43 51 supervisor::app { 'punjab':
44 52 command => 'twistd --nodaemon punjab',
45 53 directory => '/home/colab/',
... ...