aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-14 09:59:06 +0000
committerGerrit Code Review <review@openstack.org>2016-10-14 09:59:06 +0000
commitdae21b71bb7c9e5a5661afc4e0653220c3ae10cf (patch)
tree60599262c7ed98591ec8277aafa4959d9ab4966d /manifests/profile
parent0118ee839714cad6cfd2c0240cb457415348c765 (diff)
parent1941037308d5a375e86e54946476bde707b01c13 (diff)
Merge "Deploy nova over Apache httpd"
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/nova/api.pp20
1 files changed, 18 insertions, 2 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 3c472c5..03706dc 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -38,10 +38,26 @@ class tripleo::profile::base::nova::api (
include ::tripleo::profile::base::nova
if $step >= 4 or ($step >= 3 and $sync_db) {
+
+ # 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/bin', '/usr/sbin'],
+ onlyif => 'systemctl is-active openstack-nova-api',
+ refreshonly => true,
+ }
+ Nova_config<||> ~> Exec['stop_nova-api']
+ Exec['stop_nova-api'] -> Service['httpd']
+
class { '::nova::api':
- sync_db => $sync_db,
- sync_db_api => $sync_db,
+ service_name => 'httpd', # Temporary: will be moved to t-h-t
+ sync_db => $sync_db,
+ sync_db_api => $sync_db,
}
+ include ::nova::wsgi::apache
include ::nova::network::neutron
}