stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #108 from enovance/bug/98/emilien

Browse Source 
identity: Disable temporary WSGI (see: https://lists.ring.enovance.com/pipermail/team-mamba/2014-January/000183.html)
This commit is contained in:
Sebastien Badia
2014-01-29 01:45:23 -08:00
parent 197c9a3d3f d44bd4a7b4
commit 884ce27642
3 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/identity.pp
View File

@@ -390,7 +390,7 @@ class cloud::identity (
# Configure Keystone # Configure Keystone
class { 'keystone': class { 'keystone':
enabled => false, enabled => true,
admin_token => $ks_admin_token, admin_token => $ks_admin_token,
compute_port => $ks_nova_public_port, compute_port => $ks_nova_public_port,
debug => $debug, debug => $debug,
@@ -434,16 +434,16 @@ class cloud::identity (
keystone_config { 'ssl/enable': ensure => absent } keystone_config { 'ssl/enable': ensure => absent }
include 'apache' # TODO(EmilienM) Disable WSGI - bug #98
#include 'apache'
class {'keystone::wsgi::apache': # class {'keystone::wsgi::apache':
servername => $::fqdn, # servername => $::fqdn,
admin_port => $ks_keystone_admin_port, # admin_port => $ks_keystone_admin_port,
public_port => $ks_keystone_public_port, # public_port => $ks_keystone_public_port,
# TODO(EmilienM) not sure workers is useful when using WSGI backend # # TODO(EmilienM) not sure workers is useful when using WSGI backend
workers => $::processorcount, # workers => $::processorcount,
ssl => false # ssl => false
} # }
class {'swift::keystone::auth': class {'swift::keystone::auth':
address => $ks_swift_internal_host, address => $ks_swift_internal_host,

13
manifests/network/controller.pp
View File

@@ -42,19 +42,6 @@ class cloud::network::controller(
api_workers => $::processorcount api_workers => $::processorcount
} }
neutron_network { 'public':
ensure => present,
router_external => 'True',
tenant_name => $ks_admin_tenant
}
neutron_subnet {'public_subnet':
ensure => present,
cidr => $public_cidr,
network_name => 'public',
tenant_name => 'admin'
}
@@haproxy::balancermember{"${::fqdn}-neutron_api": @@haproxy::balancermember{"${::fqdn}-neutron_api":
listening_service => 'neutron_api_cluster', listening_service => 'neutron_api_cluster',
server_names => $::hostname, server_names => $::hostname,

21
spec/classes/cloud_identity_spec.rb
View File

@@ -91,7 +91,7 @@ describe 'cloud::identity' do
it 'configure keystone server' do it 'configure keystone server' do
should contain_class('keystone').with( should contain_class('keystone').with(
:enabled => false, :enabled => true,
:admin_token => 'SECRETE', :admin_token => 'SECRETE',
:compute_port => '8774', :compute_port => '8774',
:debug => true, :debug => true,
@@ -118,15 +118,16 @@ describe 'cloud::identity' do
) )
end end
it 'configure apache to run keystone with wsgi' do # TODO(EmilienM) Disable WSGI - bug #98
should contain_class('keystone::wsgi::apache').with( # it 'configure apache to run keystone with wsgi' do
:servername => 'keystone.openstack.org', # should contain_class('keystone::wsgi::apache').with(
:admin_port => '35357', # :servername => 'keystone.openstack.org',
:public_port => '5000', # :admin_port => '35357',
:workers => '2', # :public_port => '5000',
:ssl => false # :workers => '2',
) # :ssl => false
end # )
# end
it 'configure keystone endpoint' do it 'configure keystone endpoint' do
should contain_class('keystone::endpoint').with( should contain_class('keystone::endpoint').with(