diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 69c20b59f..d7911f8ba 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -327,24 +327,11 @@ 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'] - class { '::nova::api': enable_proxy_headers_parsing => $enable_proxy_headers_parsing, } include ::nova::cell_v2::simple_setup include ::nova::placement -include ::nova::wsgi::apache_api include ::nova::wsgi::apache_placement include ::nova::cert include ::nova::cron::archive_deleted_rows diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index e0bb7dd1f..80649aded 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -368,11 +368,8 @@ nova::api::enabled_apis: - osapi_compute - metadata nova::api::sync_db_api: true -nova::api::service_name: 'httpd' nova::api::osapi_compute_workers: "%{::os_workers}" nova::api::metadata_workers: "%{::os_workers}" -nova::wsgi::apache_api::ssl: false -nova::wsgi::apache_api::bind_host: {{LOCAL_IP}} nova::wsgi::apache_placement::ssl: false nova::wsgi::apache_placement::bind_host: {{LOCAL_IP}} nova::wsgi::apache_placement::api_port: '8778'