Merge "Remove explicit service_name setting from nova manifest"

This commit is contained in:
Jenkins
2016-10-18 19:55:55 +00:00
committed by Gerrit Code Review

View File

@@ -40,9 +40,8 @@ class tripleo::profile::base::nova::api (
if $step >= 4 or ($step >= 3 and $sync_db) { if $step >= 4 or ($step >= 3 and $sync_db) {
class { '::nova::api': class { '::nova::api':
service_name => 'httpd', # Temporary: will be moved to t-h-t sync_db => $sync_db,
sync_db => $sync_db, sync_db_api => $sync_db,
sync_db_api => $sync_db,
} }
include ::nova::wsgi::apache include ::nova::wsgi::apache
include ::nova::network::neutron include ::nova::network::neutron