From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 18 Oct 2016 19:55:55 +0000 (+0000)
Subject: Merge "Remove explicit service_name setting from nova manifest"
X-Git-Tag: opnfv-6.0.0~528
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c1df1d5b8289274da058ddac7575af0d65cb5fb7;p=apex-puppet-tripleo.git

Merge "Remove explicit service_name setting from nova manifest"
---

c1df1d5b8289274da058ddac7575af0d65cb5fb7
diff --cc manifests/profile/base/nova/api.pp
index c3e9ec4,beadbbf..6aedd3e
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@@ -39,10 -39,22 +39,9 @@@ class tripleo::profile::base::nova::ap
  
    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,
-       sync_db_api  => $sync_db,
+       sync_db     => $sync_db,
+       sync_db_api => $sync_db,
      }
      include ::nova::wsgi::apache
      include ::nova::network::neutron