openstack
/
fuel-library
Code Issues Proposed changes

Updates for notification_driver parameters of some services 

* don't hard-code notification driver for heat and murano
* accordingly update yaql expressions in tasks.yaml
* enable previously disabled tests because of upstream work

Change-Id: Id6d6a9a2308e716d030989944dd951cc7301751c
Related-bug: #1566716
Related-bug: #1568796
This commit is contained in:
iberezovskiy 2016-04-20 19:45:13 +03:00 committed by dmburmistrov
parent c243464376
commit e51623c6bf
10 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/examples/heat/tasks.yaml
View File

@ -6,7 +6,7 @@
requires: [primary-openstack-controller, openstack-controller]
condition:
yaql_exp: &heat_enabled >
changedAny($.network_scheme, $.heat, $.sahara, $.rabbit,
changedAny($.network_scheme, $.heat, $.sahara, $.rabbit, $.ceilometer,
$.get('max_retries'), $.get('max_pool_size'), $.get('max_overflow'),
$.get('idle_timeout'), $.network_metadata.vips, $.public_ssl,
$.get('use_ssl'), ('primary-controller' in $.roles),

2
deployment/puppet/openstack_tasks/examples/murano/tasks.yaml
View File

@ -5,7 +5,7 @@
condition:
yaql_exp: >
$.murano.enabled and changedAny($.murano, $.murano_settings,
$.rabbit, $.quantum_settings, $.network_metadata.vips,
$.rabbit, $.ceilometer, $.quantum_settings, $.network_metadata.vips,
$.get('database_vip'), $.get('region', 'RegionOne'), $.quantum,
$.network_metadata, $.get('syslog_log_facility_murano'), $.debug,
$.get('verbose'), $.get('default_log_levels'), $.get('use_syslog'),

3
deployment/puppet/openstack_tasks/manifests/heat/heat.pp
View File

@ -6,6 +6,7 @@ class openstack_tasks::heat::heat {
$heat_hash = hiera_hash('heat', {})
$sahara_hash = hiera_hash('sahara', {})
$rabbit_hash = hiera_hash('rabbit', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$max_retries = hiera('max_retries')
$max_pool_size = hiera('max_pool_size')
$max_overflow = hiera('max_overflow')
@ -216,7 +217,7 @@ class openstack_tasks::heat::heat {
max_template_size => '5440000',
max_json_body_size => '10880000',
notification_driver => 'heat.openstack.common.notifier.rpc_notifier',
notification_driver => $ceilometer_hash['notification_driver'],
database_max_pool_size => $max_pool_size,
database_max_overflow => $max_overflow,

3
deployment/puppet/openstack_tasks/manifests/murano/murano.pp
View File

@ -7,6 +7,7 @@ class openstack_tasks::murano::murano {
$murano_hash = hiera_hash('murano', {})
$murano_settings_hash = hiera_hash('murano_settings', {})
$rabbit_hash = hiera_hash('rabbit', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$neutron_config = hiera_hash('neutron_config', {})
$public_ip = hiera('public_vip')
$database_ip = hiera('database_vip')
@ -117,7 +118,7 @@ class openstack_tasks::murano::murano {
admin_password => $murano_hash['user_password'],
admin_tenant_name => $tenant,
identity_uri => "${admin_auth_protocol}://${admin_auth_address}:35357/",
notification_driver => 'messagingv2',
notification_driver => $ceilometer_hash['notification_driver'],
use_neutron => $use_neutron,
packages_service => $packages_service,
rabbit_os_user => $rabbit_hash['user'],

7
tests/noop/spec/hosts/glance/glance_spec.rb
View File

@ -44,6 +44,8 @@ describe manifest do
glance_db_user = Noop.hiera_structure 'glance/db_user', 'glance'
glance_db_name = Noop.hiera_structure 'glance/db_name', 'glance'
let(:ceilometer_hash) { Noop.hiera_structure 'ceilometer' }
let(:ssl_hash) { Noop.hiera_hash 'use_ssl', {} }
let(:internal_auth_protocol) { Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone','internal','protocol','http' }
@ -212,6 +214,11 @@ describe manifest do
end
end
it 'should contain oslo_messaging_notifications "driver" option' do
should contain_glance_api_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
should contain_glance_registry_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
end
if ['gzip', 'bz2'].include?(kombu_compression)
it 'should configure kombu compression' do
should contain_glance_api_config('oslo_messaging_rabbit/kombu_compression').with(:value => kombu_compression)

6
tests/noop/spec/hosts/heat/heat_spec.rb
View File

@ -37,6 +37,8 @@ describe manifest do
Noop.hiera 'heat_pcs_engine', false
end
let(:ceilometer_hash) { Noop.hiera_structure 'ceilometer' }
admin_auth_protocol = 'http'
admin_auth_address = Noop.hiera('service_endpoint')
if Noop.hiera_structure('use_ssl', false)
@ -185,6 +187,10 @@ describe manifest do
end
end
it 'should contain oslo_messaging_notifications "driver" option' do
should contain_heat_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
end
if ['gzip', 'bz2'].include?(kombu_compression)
it 'should configure kombu compression' do
should contain_heat_config('oslo_messaging_rabbit/kombu_compression').with(:value => kombu_compression)

9
tests/noop/spec/hosts/keystone/keystone_spec.rb
View File

@ -289,12 +289,9 @@ describe manifest do
end
end
# TODO(dmburmistrov): uncomment this test after this patch (https://review.openstack.org/#/c/302738/) merged
# if ceilometer_hash['enabled']
# it 'should configure oslo_messaging_notifications "driver"' do
# should contain_keystone_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
# end
# end
it 'should contain oslo_messaging_notifications "driver" option' do
should contain_keystone_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
end
if murano_glare_plugin['enabled']
it 'should configure glance_murano_plugin' do

6
tests/noop/spec/hosts/murano/murano_spec.rb
View File

@ -21,6 +21,10 @@ describe manifest do
Noop.hiera_hash 'network_scheme'
end
let(:ceilometer_hash) do
Noop.hiera_structure 'ceilometer'
end
let(:prepare) do
Noop.puppet_function 'prepare_network_config', network_scheme
end
@ -146,7 +150,7 @@ describe manifest do
'admin_password' => murano_password,
'admin_tenant_name' => tenant,
'identity_uri' => "#{admin_auth_protocol}://#{admin_auth_address}:35357/",
'notification_driver' => 'messagingv2',
'notification_driver' => ceilometer_hash['notification_driver'],
'use_neutron' => use_neutron,
'rabbit_os_user' => rabbit_os_user,
'rabbit_os_password' => rabbit_os_password,

15
tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb
View File

@ -195,14 +195,13 @@ describe manifest do
end
end
# TODO(dmburmistrov): uncomment this test after migration to non-deprecated option 'oslo_messaging_notifications/driver'
# it 'should contain oslo_messaging_notifications "driver" option' do
# if ceilometer_hash['enabled']
# should contain_cinder_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
# else
# should_not contain_cinder_config('oslo_messaging_notifications/driver')
# end
# end
it 'should contain oslo_messaging_notifications "driver" option' do
if ceilometer_hash['enabled']
should contain_cinder_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
else
should_not contain_cinder_config('oslo_messaging_notifications/driver')
end
end
let (:bind_host) do
Noop.puppet_function('get_network_role_property', 'cinder/api', 'ipaddr')

11
tests/noop/spec/hosts/roles/cinder_spec.rb
View File

@ -119,10 +119,13 @@ describe manifest do
Noop.hiera_hash 'ceilometer', { 'enabled' => false }
end
# TODO(dmburmistrov): uncomment this test after puppet-cinder switch to oslo resources
# it 'should contain oslo_messaging_notifications "driver" option' do
# should contain_cinder_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
# end
it 'should contain oslo_messaging_notifications "driver" option' do
if ceilometer_hash['enabled']
should contain_cinder_config('oslo_messaging_notifications/driver').with(:value => ceilometer_hash['notification_driver'])
else
should_not contain_cinder_config('oslo_messaging_notifications/driver')
end
end
it 'should check stuff that openstack cinder did' do
is_expected.to contain_class('cinder')