From bd5fd8c1095a6d66e94a6629a3be6bf5f81dc687 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 17 Oct 2016 09:47:34 +0300 Subject: Remove faulty migration logic to stop nova-api The patch making nova run over httpd had added migration logic to stop nova-api, However, this doesn't work since nova-metadata is running over the same process. Now, the fact that is was running seems to be just luck, since the systemctl runs, then we start the service via the nova::api resource. So this is fragile in it's current state. This then removes the exec, as we don't need it for the migration. Change-Id: I4603b81d30a704b07eef461b3cdbfe164614b04f --- manifests/profile/base/nova/api.pp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'manifests') 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, -- cgit 1.2.3-korg