Move gnocchi resource in-tree

This change relocates the gnocchi resources from the contrib area into
the main resource tree.

Change-Id: Icb1c18ce88470069617a035c64b3ce91850f3ad8

contrib/heat_gnocchi/README.md

@@ -1,18 +0,0 @@
-Gnocchi plugin for OpenStack Heat
-=================================
-
-This plugin adds Ceilometer Gnocchi Alarm resources in a Heat template.
-
-
-### 1. Install the Gnocchi plugin in Heat
-
-NOTE: These instructions assume the value of heat.conf plugin_dirs includes the
-default directory /usr/lib/heat.
-
-To install the plugin, from this directory run:
-    sudo python ./setup.py install
-
-### 2. Restart heat
-
-Only the process "heat-engine" needs to be restarted to load the newly installed
-plugin.

contrib/heat_gnocchi/setup.cfg

@@ -1,29 +0,0 @@
-[metadata]
-name = heat-contrib-gnocchi
-summary = Heat resources for working gnocchi queues
-description-file =
-    README.md
-author = OpenStack
-author-email = openstack-dev@lists.openstack.org
-home-page = http://www.openstack.org/
-classifier =
-    Environment :: OpenStack
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 2.6
-
-[files]
-packages =
-    heat_gnocchi
-# Copy to /usr/lib/heat for plugin loading
-data_files =
-    lib/heat/gnocchi = heat_gnocchi/resources/*
-
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook

contrib/heat_gnocchi/setup.py

@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
-import setuptools
-
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
-setuptools.setup(
-    setup_requires=['pbr'],
-    pbr=True)

heat/tests/test_gnocchi_alarm.py

@@ -16,18 +16,15 @@ import copy
 from ceilometerclient import exc as ceilometerclient_exc
 import mock
 import mox
-import six
 
 from heat.common import exception
 from heat.common import template_format
 from heat.engine.clients.os import ceilometer
-from heat.engine import resource
+from heat.engine.resources.openstack.ceilometer import gnocchi_alarm as gnocchi
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils
 
-from ..resources import gnocchi_alarm as gnocchi  # noqa
-
 gnocchi_resources_alarm_template = '''
 heat_template_version: 2013-05-23
 description: Gnocchi Resources Alarm Test
@@ -94,11 +91,6 @@ class GnocchiResourcesAlarmTest(common.HeatTestCase):
     def setUp(self):
         super(GnocchiResourcesAlarmTest, self).setUp()
         self.fc = mock.Mock()
-        self._register_resources()
-
-    def _register_resources(self):
-        for res_name, res_class in six.iteritems(gnocchi.resource_mapping()):
-            resource._register_class(res_name, res_class)
 
     def create_alarm(self):
         self.m.StubOutWithMock(ceilometer.CeilometerClientPlugin, '_create')