openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove gnocchi_url option in aodh

Browse Source 
The gnocchi_url option has been deprecated[1] and removed in aodh repo[2]

[1]https://review.openstack.org/#/c/580621/
[2]https://review.openstack.org/#/c/296877/

Change-Id: I517236631eb422987b5cb03a50c0be3890272b9e
This commit is contained in:
ZhongShengping 2018-07-10 10:55:08 +08:00
parent 3e1b4684f6
commit 68bf6cc296
1 changed files with 0 additions and 8 deletions

8
manifests/aodh.pp

@ -24,13 +24,6 @@ class openstack_integration::aodh (
Exec['update-ca-certificates'] ~> Service['httpd'] Exec['update-ca-certificates'] ~> Service['httpd']
} }
# gnocchi is not packaged in Ubuntu Cloud Archive
# https://bugs.launchpad.net/cloud-archive/+bug/1535740
if $::osfamily == 'RedHat' {
$gnocchi_url = "${::openstack_integration::config::ip_for_url}:8041"
} else {
$gnocchi_url = undef
}
class { '::aodh': class { '::aodh':
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto, 'transport' => $::openstack_integration::config::messaging_default_proto,
@ -50,7 +43,6 @@ class openstack_integration::aodh (
amqp_sasl_mechanisms => 'PLAIN', amqp_sasl_mechanisms => 'PLAIN',
debug => true, debug => true,
database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8', database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',
gnocchi_url => $gnocchi_url,
notification_topics => $notification_topics, notification_topics => $notification_topics,
notification_driver => 'messagingv2', notification_driver => 'messagingv2',
} }