openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "run nova-api with mod_proxy_uwsgi httpd module"

This commit is contained in:
Jenkins 2016-04-21 15:39:32 +00:00 committed by Gerrit Code Review
parent 0c02e91653 99ad2f9927
commit b67418ea42
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -207,7 +207,20 @@ class { '::nova':
debug => hiera('debug'),
}
# Manages the migration to Nova API in mod_wsgi with Apache.
# - First update nova.conf with new parameters
# - Stop nova-api process before starting apache to avoid binding error
# - Start apache after configuring all vhosts
exec { 'stop_nova-api':
command => 'service openstack-nova-api stop',
path => '/usr/sbin',
refreshonly => true,
}
Nova_config<||> ~> Exec['stop_nova-api']
Exec['stop_nova-api'] -> Service['httpd']
include ::nova::api
include ::nova::wsgi::apache
include ::nova::cert
include ::nova::compute
include ::nova::conductor

3
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -290,6 +290,9 @@ nova::api::admin_password: {{UNDERCLOUD_NOVA_PASSWORD}}
nova::api::osapi_v3: true
nova::api::enabled_apis: 'osapi_compute,metadata'
nova::api::sync_db_api: true
nova::api::service_name: 'httpd'
nova::wsgi::apache::ssl: false
nova::wsgi::apache::bind_host: {{LOCAL_IP}}
nova::conductor::enabled: true
nova::database_connection: mysql+pymysql://nova:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova
nova::api_database_connection: mysql+pymysql://nova_api:{{UNDERCLOUD_NOVA_PASSWORD}}@{{LOCAL_IP}}/nova_api