openstack/puppet-openstack-integration
Code Issues Proposed changes

Align stars for Ubuntu Ocata RC1

Browse Source 
1. ubuntu: enable placement API in Nova

Until now, we were only deploying Placement API on Ubuntu because
packaging was too old. Though it's becoming a requirement in Ocata RC1
so before our CI breaks when Ubuntu will update their packages, let's
enable it now.

2. ubuntu: enable ::nova::cell_v2::simple_setup

Because we have to.

Change-Id: Id0ef365539a907c131167d745f9ac6eb1cd676fd
This commit is contained in:
Emilien Macchi 2017-02-13 15:56:14 -05:00
parent 7f5a13e986
commit 25372c7dd2
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
manifests/nova.pp
View File

@ -69,10 +69,7 @@ class openstack_integration::nova (
class { '::nova::db::mysql_api': class { '::nova::db::mysql_api':
password => 'nova', password => 'nova',
} }
# TODO(aschultz): when Ubuntu supports cells (ocata-m3) enable this include ::nova::cell_v2::simple_setup
if $::osfamily == 'RedHat' {
include ::nova::cell_v2::simple_setup
}
class { '::nova::db::mysql_placement': class { '::nova::db::mysql_placement':
password => 'nova', password => 'nova',
} }
@ -120,19 +117,17 @@ class openstack_integration::nova (
sync_db_api => true, sync_db_api => true,
} }
if $::osfamily == 'RedHat' { class { '::nova::wsgi::apache_placement':
class { '::nova::wsgi::apache_placement': bind_host => $::openstack_integration::config::ip_for_url,
bind_host => $::openstack_integration::config::ip_for_url, api_port => '8778',
api_port => '8778', ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem",
ssl_key => "/etc/nova/ssl/private/${::fqdn}.pem", ssl_cert => $::openstack_integration::params::cert_path,
ssl_cert => $::openstack_integration::params::cert_path, ssl => $::openstack_integration::config::ssl,
ssl => $::openstack_integration::config::ssl, workers => '2',
workers => '2', }
} class { '::nova::placement':
class { '::nova::placement': auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_url => $::openstack_integration::config::keystone_admin_uri, password => 'a_big_secret',
password => 'a_big_secret',
}
} }
class { '::nova::client': } class { '::nova::client': }
class { '::nova::conductor': } class { '::nova::conductor': }