openstack/cookbook-openstack-compute
Code Issues Proposed changes

rename web_app placement-api to nova-placement-api to align with package

Browse Source 
* The nova-placement-api package creates a "nova-placement-api.conf" in
apache2 sites-available, which currently leads to two conflicting
configurations (our "placement-api.conf" and the one from the package
"nova-placement-api.conf"). With this change the
"nova-placement-api.conf" will be replaced with our version of it.
* version bump for cherry-picked change in stable branch

Change-Id: I8ee7f190a6d73cace60a5fcd6b58d6b4e0288a95
This commit is contained in:
Jan Klare
2017-12-13 10:48:07 +01:00
committed by Roger Luethi
parent 33be8ee247
commit fd381eba27
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.rb
View File

@@ -6,7 +6,7 @@ source_url 'https://github.com/openstack/cookbook-openstack-compute' if respond_
license 'Apache 2.0' license 'Apache 2.0'
description 'The OpenStack Compute service Nova.' description 'The OpenStack Compute service Nova.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '15.0.0' version '15.1.0'
chef_version '>= 12.5' if respond_to?(:chef_version) chef_version '>= 12.5' if respond_to?(:chef_version)
%w(ubuntu redhat centos).each do |os| %w(ubuntu redhat centos).each do |os|

2
recipes/placement_api.rb
View File

@@ -51,7 +51,7 @@ end
bind_service = node['openstack']['bind_service']['all']['placement-api'] bind_service = node['openstack']['bind_service']['all']['placement-api']
web_app 'placement-api' do web_app 'nova-placement-api' do
template 'wsgi-template.conf.erb' template 'wsgi-template.conf.erb'
daemon_process 'placement-api' daemon_process 'placement-api'
server_host bind_service['host'] server_host bind_service['host']