diff --git a/metadata.rb b/metadata.rb index c394edc2..e7aba543 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_u source_url 'https://github.com/openstack/cookbook-openstack-compute' if respond_to?(:source_url) license 'Apache-2.0' description 'The OpenStack Compute service Nova.' -version '17.0.1' +version '17.1.0' chef_version '>= 12.5' if respond_to?(:chef_version) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) diff --git a/recipes/placement_api.rb b/recipes/placement_api.rb index 8ab4f877..7ef547d6 100644 --- a/recipes/placement_api.rb +++ b/recipes/placement_api.rb @@ -24,31 +24,7 @@ end include_recipe 'openstack-compute::nova-common' -platform_options = node['openstack']['compute']['platform'] - -platform_options['api_placement_packages'].each do |pkg| - package pkg do - options platform_options['package_overrides'] - action :upgrade - end -end - -nova_user = node['openstack']['compute']['user'] -nova_group = node['openstack']['compute']['group'] -execute 'placement-api: nova-manage api_db sync' do - timeout node['openstack']['compute']['dbsync_timeout'] - user nova_user - group nova_group - command 'nova-manage api_db sync' - action :run -end - -service 'disable nova-placement-api service' do - service_name platform_options['api_placement_service'] - supports status: true, restart: true - action [:disable, :stop] -end - +# Create valid apache site configuration file before installing package bind_service = node['openstack']['bind_service']['all']['placement-api'] web_app 'nova-placement-api' do @@ -70,3 +46,28 @@ web_app 'nova-placement-api' do protocol node['openstack']['compute']['placement']['ssl']['protocol'] ciphers node['openstack']['compute']['placement']['ssl']['ciphers'] end + +platform_options = node['openstack']['compute']['platform'] + +platform_options['api_placement_packages'].each do |pkg| + package pkg do + options platform_options['package_overrides'] + action :upgrade + end +end + +service 'disable nova-placement-api service' do + service_name platform_options['api_placement_service'] + supports status: true, restart: true + action [:disable, :stop] +end + +nova_user = node['openstack']['compute']['user'] +nova_group = node['openstack']['compute']['group'] +execute 'placement-api: nova-manage api_db sync' do + timeout node['openstack']['compute']['dbsync_timeout'] + user nova_user + group nova_group + command 'nova-manage api_db sync' + action :run +end