From 1a18322fe29cf3781445dd441b5a2d2c3bf8912b Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Wed, 13 Apr 2016 14:55:28 +0200 Subject: [PATCH] fixed plugin_template notifications for neutron-server service resource Change-Id: Ice2290733a0ad0ffdf864c2bd7b088a1f35bb857 --- recipes/server.rb | 4 ++-- spec/server_spec.rb | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/recipes/server.rb b/recipes/server.rb index ef8ee16e..41c8e3fb 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -93,7 +93,7 @@ end include_recipe 'openstack-network::db_migration' plugin_templates = [] node['openstack']['network']['plugins'].each_value do |plugin| - plugin_templates << "template[#{File.join(plugin['path'], plugin['filename'])}" + plugin_templates << "template[#{File.join(plugin['path'], plugin['filename'])}]" end service 'neutron-server' do @@ -104,7 +104,7 @@ service 'neutron-server' do plugin_templates, 'template[/etc/neutron/neutron.conf]', 'remote_file[/etc/neutron/policy.json]' - ] + ].flatten end include_recipe 'openstack-network::identity_registration' diff --git a/spec/server_spec.rb b/spec/server_spec.rb index 2a5c41e7..d5a74ebc 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -37,6 +37,19 @@ describe 'openstack-network::server' do expect(chef_run).to start_service 'neutron-server' end + let(:neutron_service) { chef_run.service('neutron-server') } + + it do + expect(neutron_service) + .to subscribe_to('template[/etc/neutron/neutron.conf]').on(:restart).delayed + end + + it do + node.set['openstack']['network']['policyfile_url'] = 'http://www.someurl.com' + expect(neutron_service) + .to subscribe_to('remote_file[/etc/neutron/policy.json]').on(:restart).delayed + end + it 'allows overriding service names' do node.set['openstack']['network']['platform']['neutron_server_service'] = 'my-neutron-server'