summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2017-06-11 19:52:58 +0200
committerColleen Murphy <colleen@gazlene.net>2017-06-11 19:53:48 +0200
commit17543eceafa1cc132681e860555e9c4e423cc893 (patch)
tree85493be96ef5421abdd8b928b7b83e1c48971fcb
parentd4f6905da6ab400fc57ab2d8be13610081a8cf94 (diff)
Parameterize the php mod package name
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 22:15:57 +0000 Reviewed-on: https://review.openstack.org/473117 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--manifests/params.pp5
-rw-r--r--spec/acceptance/basic_spec.rb2
2 files changed, 5 insertions, 2 deletions
diff --git a/manifests/params.pp b/manifests/params.pp
index 5297046..b13ab83 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -43,7 +43,10 @@ class httpd::params {
43 } 43 }
44 'ubuntu', 'debian': { 44 'ubuntu', 'debian': {
45 $apache_name = 'apache2' 45 $apache_name = 'apache2'
46 $php_package = 'libapache2-mod-php5' 46 $php_package = $::lsbdistcodename ? {
47 'xenial' => 'libapache2-mod-php7.0',
48 default => 'libapache2-mod-php5'
49 }
47 $mod_python_package = 'libapache2-mod-python' 50 $mod_python_package = 'libapache2-mod-python'
48 $mod_wsgi_package = 'libapache2-mod-wsgi' 51 $mod_wsgi_package = 'libapache2-mod-wsgi'
49 $ssl_package = 'apache-ssl' 52 $ssl_package = 'apache-ssl'
diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
index 12d55ae..bcc6991 100644
--- a/spec/acceptance/basic_spec.rb
+++ b/spec/acceptance/basic_spec.rb
@@ -86,7 +86,7 @@ describe 'puppet-httpd module' do
86 package('apache2-dev'), 86 package('apache2-dev'),
87 package('libaprutil1-dev'), 87 package('libaprutil1-dev'),
88 package('libapr1-dev'), 88 package('libapr1-dev'),
89 package('libapache2-mod-php5'), 89 package('libapache2-mod-php7.0'),
90 package('libapache2-mod-python'), 90 package('libapache2-mod-python'),
91 ] 91 ]
92 92