Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Ensure that python paste deploy is installed #3

Closed
wants to merge 4 commits into from

2 participants

@clarkadamp

On Redhat, python-paste-deploy is not installed as part of any package dependencies.

As such the keystone python script errors.

python-pastedeploy is installed, but it is included in keystone::params for completeness.

@openstack-gerrit
Collaborator

Thank you for contributing to stackforge/puppet-keystone!

stackforge/puppet-keystone uses Gerrit for code review.

Please visit http://wiki.openstack.org/GerritWorkflow and follow the
instructions there to upload your change to Gerrit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 29 additions and 18 deletions.
  1. +8 −3 manifests/params.pp
  2. +21 −15 manifests/wsgi/apache.pp
View
11 manifests/params.pp
@@ -6,9 +6,12 @@
case $::osfamily {
'Debian': {
- $package_name = 'keystone'
- $service_name = 'keystone'
- $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone'
+ $package_name = 'keystone'
+ $service_name = 'keystone'
+ $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone'
+
+ $python_paste_deploy_package = 'python-pastedeploy'
+
case $::operatingsystem {
'Debian': {
$service_provider = undef
@@ -26,6 +29,8 @@
$keystone_wsgi_script_path = '/var/www/cgi-bin/keystone'
$service_provider = undef
$keystone_wsgi_script_source = 'puppet:///modules/keystone/httpd/keystone.py'
+
+ $python_paste_deploy_package = 'python-paste-deploy'
}
}
}
View
36 manifests/wsgi/apache.pp
@@ -79,21 +79,21 @@
# Copyright 2013 eNovance <licensing@enovance.com>
#
class keystone::wsgi::apache (
- $servername = $::fqdn,
- $public_port = 5000,
- $admin_port = 35357,
- $bind_host = undef,
- $public_path = '/',
- $admin_path = '/',
- $ssl = true,
- $workers = 1,
- $ssl_cert = undef,
- $ssl_key = undef,
- $ssl_chain = undef,
- $ssl_ca = undef,
- $ssl_crl_path = undef,
- $ssl_crl = undef,
- $ssl_certs_dir = undef
+ $servername = $::fqdn,
+ $public_port = 5000,
+ $admin_port = 35357,
+ $bind_host = undef,
+ $public_path = '/',
+ $admin_path = '/',
+ $ssl = true,
+ $workers = 1,
+ $ssl_cert = undef,
+ $ssl_key = undef,
+ $ssl_chain = undef,
+ $ssl_ca = undef,
+ $ssl_crl_path = undef,
+ $ssl_crl = undef,
+ $ssl_certs_dir = undef,
) {
include keystone::params
@@ -112,6 +112,12 @@
Service['httpd'] -> Keystone_user <| |>
Service['httpd'] -> Keystone_user_role <| |>
+ # Ensure that python paste deploy is installed
+ package { 'python-paste-deploy':
+ ensure => present,
+ name => $::keystone::params::python_paste_deploy_package
+ }
+
## Sanitize parameters
# Ensure there's no trailing '/' except if this is also the only character
Something went wrong with that request. Please try again.