openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "ubuntu/nova: configure notifications using keystone v3"

Browse Source
This commit is contained in:
Jenkins 2016-02-26 10:48:39 +00:00 committed by Gerrit Code Review
commit 3982ce6150
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/nova.pp
View File

@ -85,27 +85,8 @@ class openstack_integration::nova (
class { '::nova::scheduler': }
class { '::nova::vncproxy': }
# 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})")
}
class { '::nova::network::neutron':
neutron_password => 'a_big_secret',
}
}