ubuntu/nova: configure notifications using keystone v3
We had to do an exception on Ubuntu because packaging was not updated and ready to use keystone v3 for nova notifications. Now packaging is updated, we can drop the exception and be consistent between both distros. Depends-On: Ic170d932df53bb1d7bd3b0eda116ad36d0b929c6 Change-Id: I1dfe6494e8048544aca65fb1ca8b0016ea041cc8
This commit is contained in:
parent
a129a0cf05
commit
3ef1888741
@ -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',
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user