From e72f1d3cf6c5ae4489fe6b8da5f687fd89c64cc9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 29 Jan 2014 10:25:18 +0100 Subject: [PATCH] identity: disable WSGI for keystone Signed-off-by: Emilien Macchi --- manifests/identity.pp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifests/identity.pp b/manifests/identity.pp index 66e0a10c..9510f7c8 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -390,7 +390,7 @@ class cloud::identity ( # Configure Keystone class { 'keystone': - enabled => false, + enabled => true, admin_token => $ks_admin_token, compute_port => $ks_nova_public_port, debug => $debug, @@ -434,16 +434,16 @@ class cloud::identity ( keystone_config { 'ssl/enable': ensure => absent } - include 'apache' - - class {'keystone::wsgi::apache': - servername => $::fqdn, - admin_port => $ks_keystone_admin_port, - public_port => $ks_keystone_public_port, - # TODO(EmilienM) not sure workers is useful when using WSGI backend - workers => $::processorcount, - ssl => false - } + # TODO(EmilienM) Disable WSGI - bug #98 + #include 'apache' + # class {'keystone::wsgi::apache': + # servername => $::fqdn, + # admin_port => $ks_keystone_admin_port, + # public_port => $ks_keystone_public_port, + # # TODO(EmilienM) not sure workers is useful when using WSGI backend + # workers => $::processorcount, + # ssl => false + # } class {'swift::keystone::auth': address => $ks_swift_internal_host,