summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-18 09:51:18 +0000
committerGerrit Code Review <review@openstack.org>2016-10-18 09:51:18 +0000
commit4cd125fceb1182f9a041c2c2fb9774145ece793a (patch)
tree7544589ce755b96529ea4d5bd4b6447f7745bab5
parentb54e9c3a05f9bf5870e7bb98b2a8322640a6c847 (diff)
parentbd5fd8c1095a6d66e94a6629a3be6bf5f81dc687 (diff)
Merge "Remove faulty migration logic to stop nova-api"
-rw-r--r--manifests/profile/base/nova/api.pp13
1 files changed, 0 insertions, 13 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 03706dc..c3e9ec4 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -39,19 +39,6 @@ class tripleo::profile::base::nova::api (
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':
service_name => 'httpd', # Temporary: will be moved to t-h-t
sync_db => $sync_db,