From 68bf6cc2960224ebe4abf9aa42b0b217b9c4f0c4 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Tue, 10 Jul 2018 10:55:08 +0800
Subject: [PATCH] Remove gnocchi_url option in aodh

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
---
 manifests/aodh.pp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/manifests/aodh.pp b/manifests/aodh.pp
index 777d990de..b1c7fac3f 100644
--- a/manifests/aodh.pp
+++ b/manifests/aodh.pp
@@ -24,13 +24,6 @@ class openstack_integration::aodh (
     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':
     default_transport_url      => os_transport_url({
       'transport' => $::openstack_integration::config::messaging_default_proto,
@@ -50,7 +43,6 @@ class openstack_integration::aodh (
     amqp_sasl_mechanisms       => 'PLAIN',
     debug                      => true,
     database_connection        => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',
-    gnocchi_url                => $gnocchi_url,
     notification_topics        => $notification_topics,
     notification_driver        => 'messagingv2',
   }