stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #459 from enovance/icehouse-new-endpoints

Browse Source 
Icehouse bugfixes
This commit is contained in:
Sebastien Badia 2014-05-12 17:04:14 +02:00
commit 401ad1ffcd
10 changed files with 64 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.fixtures.yml
View File

@ -8,10 +8,10 @@ fixtures:
ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d' ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d'
'nova': 'nova':
repo: 'git://github.com/enovance/puppet-nova.git' repo: 'git://github.com/enovance/puppet-nova.git'
ref: '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c' ref: '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
'glance': 'glance':
repo: 'git://github.com/enovance/puppet-glance.git' repo: 'git://github.com/enovance/puppet-glance.git'
ref: 'f3bbfd9efcc2436d6ed4beca87d62168bb109453' ref: '8156a87cd04943904258d572e47838d0c346654f'
'horizon': 'horizon':
repo: 'git://github.com/enovance/puppet-horizon' repo: 'git://github.com/enovance/puppet-horizon'
ref: '36383e90d1c4013d7989561b00ffcb08c76908de' ref: '36383e90d1c4013d7989561b00ffcb08c76908de'
@ -23,7 +23,7 @@ fixtures:
ref: '66c436bc2f06c5a71d79c674697394a11ec227f9' ref: '66c436bc2f06c5a71d79c674697394a11ec227f9'
'ceilometer': 'ceilometer':
repo: 'git://github.com/enovance/puppet-ceilometer' repo: 'git://github.com/enovance/puppet-ceilometer'
ref: '615b6463ba04af34b810a358e106da25f208b080' ref: 'fe9e463fa7d9b74d91c95f0f95140f4894e57020'
'heat': 'heat':
repo: 'git://github.com/enovance/puppet-heat' repo: 'git://github.com/enovance/puppet-heat'
ref: '17736b2fd726858cb83590f8a8b1d594a087ea44' ref: '17736b2fd726858cb83590f8a8b1d594a087ea44'

7
Puppetfile
View File

@ -19,13 +19,13 @@ forge 'http://forge.puppetlabs.com'
# Core OpenStack projects # Core OpenStack projects
mod 'ceilometer', mod 'ceilometer',
:git => 'git://github.com/enovance/puppet-ceilometer.git', :git => 'git://github.com/enovance/puppet-ceilometer.git',
:ref => '615b6463ba04af34b810a358e106da25f208b080' :ref => 'fe9e463fa7d9b74d91c95f0f95140f4894e57020'
mod 'cinder', mod 'cinder',
:git => 'git://github.com/enovance/puppet-cinder.git', :git => 'git://github.com/enovance/puppet-cinder.git',
:ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2' :ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2'
mod 'glance', mod 'glance',
:git => 'git://github.com/enovance/puppet-glance.git', :git => 'git://github.com/enovance/puppet-glance.git',
:ref => 'f3bbfd9efcc2436d6ed4beca87d62168bb109453' :ref => '8156a87cd04943904258d572e47838d0c346654f'
mod 'heat', mod 'heat',
:git => 'git://github.com/enovance/puppet-heat.git', :git => 'git://github.com/enovance/puppet-heat.git',
:ref => '17736b2fd726858cb83590f8a8b1d594a087ea44' :ref => '17736b2fd726858cb83590f8a8b1d594a087ea44'
@ -40,7 +40,7 @@ mod 'neutron',
:ref => '66c436bc2f06c5a71d79c674697394a11ec227f9' :ref => '66c436bc2f06c5a71d79c674697394a11ec227f9'
mod 'nova', mod 'nova',
:git => 'git://github.com/enovance/puppet-nova.git', :git => 'git://github.com/enovance/puppet-nova.git',
:ref => '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c' :ref => '0249428f294217c2ad5fb75f8d0a0bafac12fe9c'
mod 'swift', mod 'swift',
:git => 'git://github.com/enovance/puppet-swift.git', :git => 'git://github.com/enovance/puppet-swift.git',
:ref => '9874edd2655e122bf8bd3eedc70e697bc5b83326' :ref => '9874edd2655e122bf8bd3eedc70e697bc5b83326'
@ -61,7 +61,6 @@ mod 'ceph',
#FIXME #FIXME
mod 'cloud', mod 'cloud',
:git => 'git://github.com/enovance/puppet-openstack-cloud.git', :git => 'git://github.com/enovance/puppet-openstack-cloud.git',
#:ref => 'stable/havana'
:ref => 'master' :ref => 'master'
mod 'concat', mod 'concat',
:git => 'git://github.com/enovance/puppet-concat.git', :git => 'git://github.com/enovance/puppet-concat.git',

1
manifests/compute/api.pp
View File

@ -35,6 +35,7 @@ class cloud::compute::api(
api_bind_address => $api_eth, api_bind_address => $api_eth,
metadata_listen => $api_eth, metadata_listen => $api_eth,
neutron_metadata_proxy_shared_secret => $neutron_metadata_proxy_shared_secret, neutron_metadata_proxy_shared_secret => $neutron_metadata_proxy_shared_secret,
osapi_v3 => true,
} }
@@haproxy::balancermember{"${::fqdn}-compute_api_ec2": @@haproxy::balancermember{"${::fqdn}-compute_api_ec2":

2
manifests/image/api.pp
View File

@ -104,7 +104,7 @@ class cloud::image::api(
$encoded_glance_password = uriescape($glance_db_password) $encoded_glance_password = uriescape($glance_db_password)
class { 'glance::api': class { 'glance::api':
sql_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance", database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance",
registry_host => $openstack_vip, registry_host => $openstack_vip,
registry_port => $ks_glance_registry_internal_port, registry_port => $ks_glance_registry_internal_port,
verbose => $verbose, verbose => $verbose,

26
manifests/image/registry.pp
View File

@ -86,19 +86,19 @@ class cloud::image::registry(
$encoded_glance_password = uriescape($glance_db_password) $encoded_glance_password = uriescape($glance_db_password)
class { 'glance::registry': class { 'glance::registry':
sql_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance", database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance",
verbose => $verbose, verbose => $verbose,
debug => $debug, debug => $debug,
auth_host => $ks_keystone_internal_host, auth_host => $ks_keystone_internal_host,
keystone_password => $ks_glance_password, keystone_password => $ks_glance_password,
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_user => 'glance', keystone_user => 'glance',
bind_host => $api_eth, bind_host => $api_eth,
log_dir => $log_dir, log_dir => $log_dir,
log_file => $log_file_registry, log_file => $log_file_registry,
bind_port => $ks_glance_registry_internal_port, bind_port => $ks_glance_registry_internal_port,
use_syslog => $use_syslog, use_syslog => $use_syslog,
log_facility => $log_facility, log_facility => $log_facility,
} }
exec {'glance_db_sync': exec {'glance_db_sync':

37
manifests/volume.pp
View File

@ -40,14 +40,6 @@
# (optional) Password to connect to cinder queues. # (optional) Password to connect to cinder queues.
# Defaults to 'rabbitpassword' # Defaults to 'rabbitpassword'
# #
# [*ks_keystone_internal_host*]
# (optional) Keystone host (authentication)
# Defaults to '127.0.0.1'
#
# [*ks_cinder_password*]
# (optional) Keystone password for cinder user.
# Defaults to 'cinderpassword'
#
# [*verbose*] # [*verbose*]
# (optional) Set log output to verbose output # (optional) Set log output to verbose output
# Defaults to true # Defaults to true
@ -71,11 +63,10 @@ class cloud::volume(
$cinder_db_password = 'cinderpassword', $cinder_db_password = 'cinderpassword',
$rabbit_hosts = ['127.0.0.1:5672'], $rabbit_hosts = ['127.0.0.1:5672'],
$rabbit_password = 'rabbitpassword', $rabbit_password = 'rabbitpassword',
$ks_keystone_internal_host = '127.0.0.1',
$ks_cinder_password = 'cinderpassword',
$verbose = true, $verbose = true,
$debug = true, $debug = true,
$log_facility = 'LOG_LOCAL0', $log_facility = 'LOG_LOCAL0',
$storage_availability_zone = 'nova',
$use_syslog = true $use_syslog = true
) { ) {
@ -91,16 +82,22 @@ class cloud::volume(
class { 'cinder': class { 'cinder':
sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8", sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8",
rabbit_userid => 'cinder', rabbit_userid => 'cinder',
rabbit_hosts => $rabbit_hosts, rabbit_hosts => $rabbit_hosts,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_virtual_host => '/', rabbit_virtual_host => '/',
verbose => $verbose, verbose => $verbose,
debug => $debug, debug => $debug,
log_dir => $log_dir, log_dir => $log_dir,
log_facility => $log_facility, log_facility => $log_facility,
use_syslog => $use_syslog use_syslog => $use_syslog,
# https://review.openstack.org/#/c/92993/
# storage_availability_zone => $storage_availability_zone
}
cinder_config {
'DEFAULT/storage_availability_zone': value => $storage_availability_zone
} }
class { 'cinder::ceilometer': } class { 'cinder::ceilometer': }

3
spec/classes/cloud_compute_controller_spec.rb
View File

@ -122,7 +122,8 @@ describe 'cloud::compute::controller' do
:admin_password => 'secrete', :admin_password => 'secrete',
:api_bind_address => '10.0.0.1', :api_bind_address => '10.0.0.1',
:metadata_listen => '10.0.0.1', :metadata_listen => '10.0.0.1',
:neutron_metadata_proxy_shared_secret => 'secrete' :neutron_metadata_proxy_shared_secret => 'secrete',
:osapi_v3 => true
) )
end end

4
spec/classes/cloud_image_spec.rb
View File

@ -45,7 +45,7 @@ describe 'cloud::image' do
it 'configure glance-api' do it 'configure glance-api' do
should contain_class('glance::api').with( should contain_class('glance::api').with(
:sql_connection => 'mysql://glance:secrete@10.0.0.1/glance', :database_connection => 'mysql://glance:secrete@10.0.0.1/glance',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:registry_host => '10.0.0.42', :registry_host => '10.0.0.42',
:registry_port => '9191', :registry_port => '9191',
@ -66,7 +66,7 @@ describe 'cloud::image' do
it 'configure glance-registry' do it 'configure glance-registry' do
should contain_class('glance::registry').with( should contain_class('glance::registry').with(
:sql_connection => 'mysql://glance:secrete@10.0.0.1/glance', :database_connection => 'mysql://glance:secrete@10.0.0.1/glance',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:keystone_tenant => 'services', :keystone_tenant => 'services',
:keystone_user => 'glance', :keystone_user => 'glance',

22
spec/classes/cloud_volume_controller_spec.rb
View File

@ -29,11 +29,10 @@ describe 'cloud::volume::controller' do
cinder_db_password => 'secrete', cinder_db_password => 'secrete',
rabbit_hosts => ['10.0.0.1'], rabbit_hosts => ['10.0.0.1'],
rabbit_password => 'secrete', rabbit_password => 'secrete',
ks_keystone_internal_host => '10.0.0.1',
ks_cinder_password => 'secrete',
verbose => true, verbose => true,
debug => true, debug => true,
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
storage_availability_zone => 'nova',
use_syslog => true }" use_syslog => true }"
end end
@ -52,15 +51,16 @@ describe 'cloud::volume::controller' do
it 'configure cinder common' do it 'configure cinder common' do
should contain_class('cinder').with( should contain_class('cinder').with(
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:rabbit_userid => 'cinder', :rabbit_userid => 'cinder',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:use_syslog => true, :use_syslog => true,
:log_dir => false :log_dir => false,
# :storage_availability_zone => 'nova'
) )
should contain_class('cinder::ceilometer') should contain_class('cinder::ceilometer')
end end

22
spec/classes/cloud_volume_storage_spec.rb
View File

@ -29,11 +29,10 @@ describe 'cloud::volume::storage' do
cinder_db_password => 'secret', cinder_db_password => 'secret',
rabbit_hosts => ['10.0.0.1'], rabbit_hosts => ['10.0.0.1'],
rabbit_password => 'secret', rabbit_password => 'secret',
ks_keystone_internal_host => '10.0.0.1',
ks_cinder_password => 'secret',
verbose => true, verbose => true,
debug => true, debug => true,
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
storage_availability_zone => 'nova',
use_syslog => true }" use_syslog => true }"
end end
@ -66,15 +65,16 @@ describe 'cloud::volume::storage' do
it 'configure cinder common' do it 'configure cinder common' do
should contain_class('cinder').with( should contain_class('cinder').with(
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:rabbit_userid => 'cinder', :rabbit_userid => 'cinder',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secret', :rabbit_password => 'secret',
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:use_syslog => true, :use_syslog => true,
:log_dir => false :log_dir => false,
# :storage_availability_zone => 'nova'
) )
should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier') should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')