stackforge/puppet-openstack-cloud
Code Issues Proposed changes

identity: Temporary disable keystone apache (refs: #4524)

Browse Source
This commit is contained in:
Sebastien Badia 2013-12-27 10:30:28 +01:00
parent bc3df8f216
commit fcb1da3528
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
roles/identity/identity-controller.pp
View File

@ -83,7 +83,8 @@ class os_identity_controller (
# Configure Keystone # Configure Keystone
class { 'keystone': class { 'keystone':
enabled => false, #FIXME(sbadia) https://dev.ring.enovance.com/redmine/issues/4524
enabled => true,
admin_token => $ks_admin_token, admin_token => $ks_admin_token,
compute_port => '8774', compute_port => '8774',
debug => $debug, debug => $debug,
@ -127,13 +128,14 @@ class os_identity_controller (
include 'apache' include 'apache'
class {'keystone::wsgi::apache': #FIXME(sbadia) https://dev.ring.enovance.com/redmine/issues/4524
servername => $::fqdn, #class {'keystone::wsgi::apache':
admin_port => $ks_keystone_admin_port, # servername => $::fqdn,
public_port => $ks_keystone_public_port, # admin_port => $ks_keystone_admin_port,
workers => $::processorcount, # public_port => $ks_keystone_public_port,
ssl => false, # workers => $::processorcount,
} # ssl => false,
#}
class {'swift::keystone::auth': class {'swift::keystone::auth':
address => $ks_swift_internal_host, address => $ks_swift_internal_host,