Bump RDO packaging and update nova.conf on RedHat systems

This is a stash between 2 patches, that need to land together:

1/ Bump RDO packaging to a very recent Mitaka repo URL so we can have
latest Nova & Gnocchi, that contains some importants changes.
Related-Bug: #1542069
Depends-On: Icf4a4b38fbba4fd2e4a20c7c3ffeacf1cc86085e

2/ Update nova.pp with new parameters for Neutron / Nova communications
Related-Bug: #1542486
Depends-On: I1a99a050ba70399f045930e26e52719bb53a75b3

Change-Id: Idc14417cc09ee4ec58b343e57d67b0bd2efeecf2
This commit is contained in:
David Moreau Simard 2016-02-04 18:07:01 -05:00 committed by Emilien Macchi
parent f954c0070c
commit 9f02f8b965
2 changed files with 26 additions and 6 deletions

@ -62,8 +62,28 @@ class openstack_integration::nova {
}
class { '::nova::scheduler': }
class { '::nova::vncproxy': }
class { '::nova::network::neutron':
neutron_password => 'a_big_secret',
# Nova versions are different on Ubuntu & RedHat systems.
# RedHat packaging is more recent than Ubuntu.
# Recent Nova in Mitaka requires keystone v3 credentials.
# See LP #1542486 for more details.
# Drop this case when Ubuntu will update Mitaka packaging.
case $::osfamily {
'Debian': {
class { '::nova::network::neutron':
neutron_auth_url => 'http://127.0.0.1:35357',
neutron_auth_plugin => 'password',
neutron_password => 'a_big_secret',
}
}
'RedHat': {
class { '::nova::network::neutron':
neutron_password => 'a_big_secret',
}
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
}

@ -22,13 +22,13 @@ class openstack_integration::repos {
manage_priorities => false,
manage_rdo => false,
repo_hash => {
'mitaka-current-passed-ci' => {
'baseurl' => 'http://trunk.rdoproject.org/centos7/current-passed-ci/',
'descr' => 'Mitaka tested',
'mitaka-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7/5b/14/5b14d1e1de78ca59521b953f7e4e345665e6cea8_563ab7b1/',
'descr' => 'Mitaka Current',
'gpgcheck' => 'no',
'priority' => 1,
},
'delorean-deps' => {
'delorean-deps' => {
'baseurl' => 'http://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-liberty/',
'descr' => 'Liberty delorean-deps',
'gpgcheck' => 'no',