Move zaqar resource in-tree

This change relocates the zaqar resource from the contrib area into the main
resource tree, to save users from the trouble of installing it as a
plugin.

Change-Id: I480d6ec4785e3930afc5a153d31aa6ed4ec089b3

contrib/heat_zaqar/README.md

@@ -1,18 +0,0 @@
-Zaqar plugin for OpenStack Heat
-================================
-
-This plugin enable using Zaqar queuing service as a resource in a Heat template.
-
-
-### 1. Install the Zaqar 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_zaqar/setup.cfg

@@ -1,29 +0,0 @@
-[metadata]
-name = heat-contrib-zaqar
-summary = Heat resources for working Zaqar 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_zaqar
-# Copy to /usr/lib/heat for plugin loading
-data_files =
-    lib/heat/zaqar = heat_zaqar/resources/*
-
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook

contrib/heat_zaqar/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/engine/resources/openstack/zaqar/queue.py

@@ -24,6 +24,8 @@ class ZaqarQueue(resource.Resource):
 
     default_client_name = "zaqar"
 
+    support_status = support.SupportStatus(version='2014.2')
+
     PROPERTIES = (
         NAME, METADATA,
     ) = (

heat/tests/test_zaqar_queue.py

@@ -17,6 +17,7 @@ import six
 from heat.common import exception
 from heat.common import template_format
 from heat.engine import resource
+from heat.engine.resources.openstack.zaqar import queue
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.engine import stack
@@ -24,8 +25,6 @@ from heat.engine import template
 from heat.tests import common
 from heat.tests import utils
 
-from ..resources import queue  # noqa
-
 try:
     from zaqarclient.transport.errors import ResourceNotFound  # noqa
 except ImportError:
@@ -82,8 +81,6 @@ class ZaqarMessageQueueTest(common.HeatTestCase):
         super(ZaqarMessageQueueTest, self).setUp()
         self.fc = self.m.CreateMockAnything()
         self.ctx = utils.dummy_context()
-        resource._register_class("OS::Zaqar::Queue",
-                                 queue.ZaqarQueue)
 
     def parse_stack(self, t):
         stack_name = 'test_stack'