From 95c5a0b4907aac1ab991ce06dd9e314bb404dc8b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 8 May 2014 01:08:15 +0200 Subject: [PATCH 1/6] enable nova api v3 Signed-off-by: Emilien Macchi --- manifests/compute/api.pp | 1 + spec/classes/cloud_compute_controller_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/compute/api.pp b/manifests/compute/api.pp index d653dfd9..0297b55a 100644 --- a/manifests/compute/api.pp +++ b/manifests/compute/api.pp @@ -35,6 +35,7 @@ class cloud::compute::api( api_bind_address => $api_eth, metadata_listen => $api_eth, neutron_metadata_proxy_shared_secret => $neutron_metadata_proxy_shared_secret, + osapi_v3 => true, } @@haproxy::balancermember{"${::fqdn}-compute_api_ec2": diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index 5054e5c9..9f5c2034 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -122,7 +122,8 @@ describe 'cloud::compute::controller' do :admin_password => 'secrete', :api_bind_address => '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 From 2e3462c89105a6b1c93629b776b6146d5964a3b6 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 8 May 2014 01:12:27 +0200 Subject: [PATCH 2/6] Update refs for ceilometer Signed-off-by: Emilien Macchi --- .fixtures.yml | 2 +- Puppetfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 8a14fa97..5cf40315 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -23,7 +23,7 @@ fixtures: ref: '66c436bc2f06c5a71d79c674697394a11ec227f9' 'ceilometer': repo: 'git://github.com/enovance/puppet-ceilometer' - ref: '615b6463ba04af34b810a358e106da25f208b080' + ref: 'fe9e463fa7d9b74d91c95f0f95140f4894e57020' 'heat': repo: 'git://github.com/enovance/puppet-heat' ref: '17736b2fd726858cb83590f8a8b1d594a087ea44' diff --git a/Puppetfile b/Puppetfile index 63d120ef..effe4055 100644 --- a/Puppetfile +++ b/Puppetfile @@ -19,7 +19,7 @@ forge 'http://forge.puppetlabs.com' # Core OpenStack projects mod 'ceilometer', :git => 'git://github.com/enovance/puppet-ceilometer.git', - :ref => '615b6463ba04af34b810a358e106da25f208b080' + :ref => 'fe9e463fa7d9b74d91c95f0f95140f4894e57020' mod 'cinder', :git => 'git://github.com/enovance/puppet-cinder.git', :ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2' @@ -61,7 +61,6 @@ mod 'ceph', #FIXME mod 'cloud', :git => 'git://github.com/enovance/puppet-openstack-cloud.git', - #:ref => 'stable/havana' :ref => 'master' mod 'concat', :git => 'git://github.com/enovance/puppet-concat.git', From 99baef9e40fe375d1173c517af903d9c7b25cba3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 8 May 2014 23:44:08 +0200 Subject: [PATCH 3/6] glance: update mysql parameters --- manifests/image/api.pp | 2 +- manifests/image/registry.pp | 26 +++++++++++++------------- spec/classes/cloud_image_spec.rb | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifests/image/api.pp b/manifests/image/api.pp index d1b31083..d82e6c33 100644 --- a/manifests/image/api.pp +++ b/manifests/image/api.pp @@ -104,7 +104,7 @@ class cloud::image::api( $encoded_glance_password = uriescape($glance_db_password) 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_port => $ks_glance_registry_internal_port, verbose => $verbose, diff --git a/manifests/image/registry.pp b/manifests/image/registry.pp index 1cddea29..be83ab9e 100644 --- a/manifests/image/registry.pp +++ b/manifests/image/registry.pp @@ -86,19 +86,19 @@ class cloud::image::registry( $encoded_glance_password = uriescape($glance_db_password) class { 'glance::registry': - sql_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance", - verbose => $verbose, - debug => $debug, - auth_host => $ks_keystone_internal_host, - keystone_password => $ks_glance_password, - keystone_tenant => 'services', - keystone_user => 'glance', - bind_host => $api_eth, - log_dir => $log_dir, - log_file => $log_file_registry, - bind_port => $ks_glance_registry_internal_port, - use_syslog => $use_syslog, - log_facility => $log_facility, + database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance", + verbose => $verbose, + debug => $debug, + auth_host => $ks_keystone_internal_host, + keystone_password => $ks_glance_password, + keystone_tenant => 'services', + keystone_user => 'glance', + bind_host => $api_eth, + log_dir => $log_dir, + log_file => $log_file_registry, + bind_port => $ks_glance_registry_internal_port, + use_syslog => $use_syslog, + log_facility => $log_facility, } exec {'glance_db_sync': diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index 9070283f..61eee37e 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -45,7 +45,7 @@ describe 'cloud::image' do it 'configure glance-api' do 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', :registry_host => '10.0.0.42', :registry_port => '9191', @@ -66,7 +66,7 @@ describe 'cloud::image' do it 'configure glance-registry' do 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_tenant => 'services', :keystone_user => 'glance', From 23ba374a90e244fbf7be3f0f19d38692afd03d8c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 9 May 2014 00:37:01 +0200 Subject: [PATCH 4/6] volume: drop useless parameters --- manifests/volume.pp | 10 ---------- spec/classes/cloud_volume_controller_spec.rb | 2 -- spec/classes/cloud_volume_storage_spec.rb | 2 -- 3 files changed, 14 deletions(-) diff --git a/manifests/volume.pp b/manifests/volume.pp index 697fb7d3..60c7a9ec 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -40,14 +40,6 @@ # (optional) Password to connect to cinder queues. # 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*] # (optional) Set log output to verbose output # Defaults to true @@ -71,8 +63,6 @@ class cloud::volume( $cinder_db_password = 'cinderpassword', $rabbit_hosts = ['127.0.0.1:5672'], $rabbit_password = 'rabbitpassword', - $ks_keystone_internal_host = '127.0.0.1', - $ks_cinder_password = 'cinderpassword', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index fb6b15d1..13f0d315 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -29,8 +29,6 @@ describe 'cloud::volume::controller' do cinder_db_password => 'secrete', rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', - ks_keystone_internal_host => '10.0.0.1', - ks_cinder_password => 'secrete', verbose => true, debug => true, log_facility => 'LOG_LOCAL0', diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 98490a66..01052770 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -29,8 +29,6 @@ describe 'cloud::volume::storage' do cinder_db_password => 'secret', rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secret', - ks_keystone_internal_host => '10.0.0.1', - ks_cinder_password => 'secret', verbose => true, debug => true, log_facility => 'LOG_LOCAL0', From 5beaf07f2f7a01c6c64bac05d105b272c058b00b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 9 May 2014 09:30:14 +0200 Subject: [PATCH 5/6] volume: AZ support Bring storage_availability_zone support. --- manifests/volume.pp | 22 +++++++++++--------- spec/classes/cloud_volume_controller_spec.rb | 20 ++++++++++-------- spec/classes/cloud_volume_storage_spec.rb | 20 ++++++++++-------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/manifests/volume.pp b/manifests/volume.pp index 60c7a9ec..eaacaf47 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -66,6 +66,7 @@ class cloud::volume( $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', + $storage_availability_zone = 'nova', $use_syslog = true ) { @@ -81,16 +82,17 @@ class cloud::volume( class { 'cinder': - sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8", - rabbit_userid => 'cinder', - rabbit_hosts => $rabbit_hosts, - rabbit_password => $rabbit_password, - rabbit_virtual_host => '/', - verbose => $verbose, - debug => $debug, - log_dir => $log_dir, - log_facility => $log_facility, - use_syslog => $use_syslog + sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8", + rabbit_userid => 'cinder', + rabbit_hosts => $rabbit_hosts, + rabbit_password => $rabbit_password, + rabbit_virtual_host => '/', + verbose => $verbose, + debug => $debug, + log_dir => $log_dir, + log_facility => $log_facility, + use_syslog => $use_syslog, + storage_availability_zone => $storage_availability_zone } class { 'cinder::ceilometer': } diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index 13f0d315..6e28b264 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::volume::controller' do verbose => true, debug => true, log_facility => 'LOG_LOCAL0', + storage_availability_zone => 'nova', use_syslog => true }" end @@ -50,15 +51,16 @@ describe 'cloud::volume::controller' do it 'configure cinder common' do should contain_class('cinder').with( - :verbose => true, - :debug => true, - :rabbit_userid => 'cinder', - :rabbit_hosts => ['10.0.0.1'], - :rabbit_password => 'secrete', - :rabbit_virtual_host => '/', - :log_facility => 'LOG_LOCAL0', - :use_syslog => true, - :log_dir => false + :verbose => true, + :debug => true, + :rabbit_userid => 'cinder', + :rabbit_hosts => ['10.0.0.1'], + :rabbit_password => 'secrete', + :rabbit_virtual_host => '/', + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, + :log_dir => false, + :storage_availability_zone => 'nova' ) should contain_class('cinder::ceilometer') end diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 01052770..134e3bde 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::volume::storage' do verbose => true, debug => true, log_facility => 'LOG_LOCAL0', + storage_availability_zone => 'nova', use_syslog => true }" end @@ -64,15 +65,16 @@ describe 'cloud::volume::storage' do it 'configure cinder common' do should contain_class('cinder').with( - :verbose => true, - :debug => true, - :rabbit_userid => 'cinder', - :rabbit_hosts => ['10.0.0.1'], - :rabbit_password => 'secret', - :rabbit_virtual_host => '/', - :log_facility => 'LOG_LOCAL0', - :use_syslog => true, - :log_dir => false + :verbose => true, + :debug => true, + :rabbit_userid => 'cinder', + :rabbit_hosts => ['10.0.0.1'], + :rabbit_password => 'secret', + :rabbit_virtual_host => '/', + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, + :log_dir => false, + :storage_availability_zone => 'nova' ) should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier') From c27e90ab06757b13d25fb3f3fe90aadb1846fda1 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 12 May 2014 10:34:34 -0400 Subject: [PATCH 6/6] Update to latest refs Signed-off-by: Emilien Macchi --- .fixtures.yml | 4 ++-- Puppetfile | 4 ++-- manifests/volume.pp | 7 ++++++- spec/classes/cloud_volume_controller_spec.rb | 2 +- spec/classes/cloud_volume_storage_spec.rb | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 5cf40315..5f00bff9 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -8,10 +8,10 @@ fixtures: ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d' 'nova': repo: 'git://github.com/enovance/puppet-nova.git' - ref: '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c' + ref: '0249428f294217c2ad5fb75f8d0a0bafac12fe9c' 'glance': repo: 'git://github.com/enovance/puppet-glance.git' - ref: 'f3bbfd9efcc2436d6ed4beca87d62168bb109453' + ref: '8156a87cd04943904258d572e47838d0c346654f' 'horizon': repo: 'git://github.com/enovance/puppet-horizon' ref: '36383e90d1c4013d7989561b00ffcb08c76908de' diff --git a/Puppetfile b/Puppetfile index effe4055..493b294e 100644 --- a/Puppetfile +++ b/Puppetfile @@ -25,7 +25,7 @@ mod 'cinder', :ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2' mod 'glance', :git => 'git://github.com/enovance/puppet-glance.git', - :ref => 'f3bbfd9efcc2436d6ed4beca87d62168bb109453' + :ref => '8156a87cd04943904258d572e47838d0c346654f' mod 'heat', :git => 'git://github.com/enovance/puppet-heat.git', :ref => '17736b2fd726858cb83590f8a8b1d594a087ea44' @@ -40,7 +40,7 @@ mod 'neutron', :ref => '66c436bc2f06c5a71d79c674697394a11ec227f9' mod 'nova', :git => 'git://github.com/enovance/puppet-nova.git', - :ref => '1e77a9d48a85a3ae6d30993b3c887f58e4a5973c' + :ref => '0249428f294217c2ad5fb75f8d0a0bafac12fe9c' mod 'swift', :git => 'git://github.com/enovance/puppet-swift.git', :ref => '9874edd2655e122bf8bd3eedc70e697bc5b83326' diff --git a/manifests/volume.pp b/manifests/volume.pp index eaacaf47..45dd4ff1 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -92,7 +92,12 @@ class cloud::volume( log_dir => $log_dir, log_facility => $log_facility, use_syslog => $use_syslog, - storage_availability_zone => $storage_availability_zone + # 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': } diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index 6e28b264..609783eb 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -60,7 +60,7 @@ describe 'cloud::volume::controller' do :log_facility => 'LOG_LOCAL0', :use_syslog => true, :log_dir => false, - :storage_availability_zone => 'nova' + # :storage_availability_zone => 'nova' ) should contain_class('cinder::ceilometer') end diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 134e3bde..e55d906d 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -74,7 +74,7 @@ describe 'cloud::volume::storage' do :log_facility => 'LOG_LOCAL0', :use_syslog => true, :log_dir => false, - :storage_availability_zone => 'nova' + # :storage_availability_zone => 'nova' ) should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')