From 0eb93cbf3399a59d3227dd6d3a9a90b4dae8588f Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 30 Jun 2014 13:33:22 +1200 Subject: [PATCH] Use setuptools to install contrib plugins This change creates a pbr setup.cfg and specifies a data_files entry to install the contrib plugin source into the /usr/lib/heat plugin directory. This change also temporarily disables docs building for contrib resoures until the transition to stevedore is fully complete. Change-Id: I1c91aee20f72dc2a5a049e67de1d6d7cbabda241 --- .gitignore | 2 +- contrib/barbican/README.md | 18 +++++++++++ contrib/barbican/setup.cfg | 27 +++++++++++++++++ contrib/barbican/setup.py | 30 +++++++++++++++++++ contrib/docker/README.md | 18 +++++++++++ contrib/docker/docker/README.md | 29 ------------------ contrib/docker/setup.cfg | 27 +++++++++++++++++ contrib/docker/setup.py | 30 +++++++++++++++++++ contrib/extraroute/setup.cfg | 27 +++++++++++++++++ contrib/extraroute/setup.py | 30 +++++++++++++++++++ contrib/heat_keystoneclient_v2/README.md | 5 ++-- contrib/heat_keystoneclient_v2/setup.cfg | 27 +++++++++++++++++ contrib/heat_keystoneclient_v2/setup.py | 30 +++++++++++++++++++ contrib/marconi/README.md | 11 +++---- contrib/marconi/setup.cfg | 27 +++++++++++++++++ contrib/marconi/setup.py | 30 +++++++++++++++++++ .../nova_flavor/{nova_flavor => }/README.md | 8 +++-- contrib/nova_flavor/setup.cfg | 27 +++++++++++++++++ contrib/nova_flavor/setup.py | 30 +++++++++++++++++++ contrib/rackspace/README.md | 15 ++++++++++ contrib/rackspace/setup.cfg | 27 +++++++++++++++++ contrib/rackspace/setup.py | 30 +++++++++++++++++++ doc/source/conf.py | 2 +- 23 files changed, 463 insertions(+), 44 deletions(-) create mode 100644 contrib/barbican/README.md create mode 100644 contrib/barbican/setup.cfg create mode 100644 contrib/barbican/setup.py create mode 100644 contrib/docker/README.md delete mode 100644 contrib/docker/docker/README.md create mode 100644 contrib/docker/setup.cfg create mode 100644 contrib/docker/setup.py create mode 100644 contrib/extraroute/setup.cfg create mode 100644 contrib/extraroute/setup.py create mode 100644 contrib/heat_keystoneclient_v2/setup.cfg create mode 100644 contrib/heat_keystoneclient_v2/setup.py create mode 100644 contrib/marconi/setup.cfg create mode 100644 contrib/marconi/setup.py rename contrib/nova_flavor/{nova_flavor => }/README.md (89%) create mode 100644 contrib/nova_flavor/setup.cfg create mode 100644 contrib/nova_flavor/setup.py create mode 100644 contrib/rackspace/setup.cfg create mode 100644 contrib/rackspace/setup.py diff --git a/.gitignore b/.gitignore index 3c0b5f5c68..45c684656d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *~ build dist -heat.egg-info +*.egg-info tags *.log heat-test.db diff --git a/contrib/barbican/README.md b/contrib/barbican/README.md new file mode 100644 index 0000000000..7932963e7c --- /dev/null +++ b/contrib/barbican/README.md @@ -0,0 +1,18 @@ +Barbican plugin for OpenStack Heat +================================ + +This plugin enables using Barbican resources in a Heat template. + + +### 1. Install the Barbican 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. diff --git a/contrib/barbican/setup.cfg b/contrib/barbican/setup.cfg new file mode 100644 index 0000000000..c3eb71bf6b --- /dev/null +++ b/contrib/barbican/setup.cfg @@ -0,0 +1,27 @@ +[metadata] +name = heat-contrib-barbican +summary = Heat resources for Barbican +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] +# Copy to /usr/lib/heat for plugin loading +data_files = + lib/heat/barbican = barbican/resources/* + +[global] +setup-hooks = + pbr.hooks.setup_hook diff --git a/contrib/barbican/setup.py b/contrib/barbican/setup.py new file mode 100644 index 0000000000..736375744d --- /dev/null +++ b/contrib/barbican/setup.py @@ -0,0 +1,30 @@ +#!/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) diff --git a/contrib/docker/README.md b/contrib/docker/README.md new file mode 100644 index 0000000000..4f35ad5cc9 --- /dev/null +++ b/contrib/docker/README.md @@ -0,0 +1,18 @@ +Docker plugin for OpenStack Heat +================================ + +This plugin enable using Docker containers as resources in a Heat template. + + +### 1. Install the Docker 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 new installed +plugin. diff --git a/contrib/docker/docker/README.md b/contrib/docker/docker/README.md deleted file mode 100644 index 59e3aae575..0000000000 --- a/contrib/docker/docker/README.md +++ /dev/null @@ -1,29 +0,0 @@ -Docker plugin for OpenStack Heat -================================ - -This plugin enable using Docker containers as resources in a Heat template. - - -### 1. Install the Docker plugin in Heat - -NOTE: Heat scans several directories to find plugins. The list of directories -is specified in the configuration file "heat.conf" with the "plugin_dirs" -directive. - -Running the following commands will install the Docker plugin in an existing -Heat setup. - -``` -pip install -r requirements.txt -ln -sf $(cd heat/contrib/docker-plugin/plugin; pwd) /usr/lib/heat/docker -echo "plugin_dirs=$(cd heat/contrib/docker-plugin/plugin; pwd)" > /etc/heat/heat.conf -``` - -NOTE: If you already have plugins enabled, you should not run the last command -and instead edit the config file "/etc/heat/heat.conf" manually. - - -### 2. Restart heat - -Only the process "heat-engine" needs to be restarted to load the new installed -plugin. diff --git a/contrib/docker/setup.cfg b/contrib/docker/setup.cfg new file mode 100644 index 0000000000..45a4303551 --- /dev/null +++ b/contrib/docker/setup.cfg @@ -0,0 +1,27 @@ +[metadata] +name = heat-contrib-docker +summary = Heat resource for Docker containers +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] +# Copy to /usr/lib/heat for plugin loading +data_files = + lib/heat/docker = docker/resources/* + +[global] +setup-hooks = + pbr.hooks.setup_hook diff --git a/contrib/docker/setup.py b/contrib/docker/setup.py new file mode 100644 index 0000000000..736375744d --- /dev/null +++ b/contrib/docker/setup.py @@ -0,0 +1,30 @@ +#!/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) diff --git a/contrib/extraroute/setup.cfg b/contrib/extraroute/setup.cfg new file mode 100644 index 0000000000..089827c6ea --- /dev/null +++ b/contrib/extraroute/setup.cfg @@ -0,0 +1,27 @@ +[metadata] +name = heat-contrib-extraroute +summary = Heat resource for ExtraRoute +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] +# Copy to /usr/lib/heat for plugin loading +data_files = + lib/heat/extraroute = extraroute/resources/* + +[global] +setup-hooks = + pbr.hooks.setup_hook diff --git a/contrib/extraroute/setup.py b/contrib/extraroute/setup.py new file mode 100644 index 0000000000..736375744d --- /dev/null +++ b/contrib/extraroute/setup.py @@ -0,0 +1,30 @@ +#!/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) diff --git a/contrib/heat_keystoneclient_v2/README.md b/contrib/heat_keystoneclient_v2/README.md index 2708902a1f..0d7223718d 100644 --- a/contrib/heat_keystoneclient_v2/README.md +++ b/contrib/heat_keystoneclient_v2/README.md @@ -13,9 +13,8 @@ Some forward compatibility decisions had to be made: # Installation -1. In `heat.conf`, add the path to the `heat_keystoneclient_v2` root - directory to `plugin_dirs`. - e.g.: `plugin_dirs=path/to/heat/contrib/heat_keystoneclient_v2` +1. From this directory run: + sudo python ./setup.py install 2. Set the `keystone_backend` option to `heat.engine.plugins.heat_keystoneclient_v2.client.KeystoneClientV2` diff --git a/contrib/heat_keystoneclient_v2/setup.cfg b/contrib/heat_keystoneclient_v2/setup.cfg new file mode 100644 index 0000000000..5e34fd2791 --- /dev/null +++ b/contrib/heat_keystoneclient_v2/setup.cfg @@ -0,0 +1,27 @@ +[metadata] +name = heat-contrib-keystone-v2 +summary = Keystone V2 compatible client +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] +# Copy to /usr/lib/heat for plugin loading +data_files = + lib/heat/heat_keystoneclient_v2 = heat_keystoneclient_v2/* + +[global] +setup-hooks = + pbr.hooks.setup_hook diff --git a/contrib/heat_keystoneclient_v2/setup.py b/contrib/heat_keystoneclient_v2/setup.py new file mode 100644 index 0000000000..736375744d --- /dev/null +++ b/contrib/heat_keystoneclient_v2/setup.py @@ -0,0 +1,30 @@ +#!/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) diff --git a/contrib/marconi/README.md b/contrib/marconi/README.md index 89645680ad..3d86358f24 100644 --- a/contrib/marconi/README.md +++ b/contrib/marconi/README.md @@ -6,14 +6,11 @@ This plugin enable using Marconi queuing service as a resource in a Heat templat ### 1. Install the Marconi plugin in Heat -NOTE: Heat scans several directories to find plugins. The list of directories -is specified in the configuration file "heat.conf" with the "plugin_dirs" -directive. - -To install the Marconi plugin, one needs to first make sure the -python-marconiclient package is installed - pip install -r requirements.txt, and -copy the plugin folder, e.g. marconi to wherever plugin_dirs points to. +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 diff --git a/contrib/marconi/setup.cfg b/contrib/marconi/setup.cfg new file mode 100644 index 0000000000..0ddc5ffe4a --- /dev/null +++ b/contrib/marconi/setup.cfg @@ -0,0 +1,27 @@ +[metadata] +name = heat-contrib-marconi +summary = Heat resources for working Marconi 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] +# Copy to /usr/lib/heat for plugin loading +data_files = + lib/heat/marconi = marconi/resources/* + +[global] +setup-hooks = + pbr.hooks.setup_hook diff --git a/contrib/marconi/setup.py b/contrib/marconi/setup.py new file mode 100644 index 0000000000..736375744d --- /dev/null +++ b/contrib/marconi/setup.py @@ -0,0 +1,30 @@ +#!/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) diff --git a/contrib/nova_flavor/nova_flavor/README.md b/contrib/nova_flavor/README.md similarity index 89% rename from contrib/nova_flavor/nova_flavor/README.md rename to contrib/nova_flavor/README.md index f17a8cf9bf..ad9964633d 100644 --- a/contrib/nova_flavor/nova_flavor/README.md +++ b/contrib/nova_flavor/README.md @@ -10,9 +10,11 @@ all flavor have a global scope. ### 1. Install the Nova Flavor plugin in Heat -NOTE: Heat scans several directories to find plugins. The list of directories -is specified in the configuration file "heat.conf" with the "plugin_dirs" -directive. +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 diff --git a/contrib/nova_flavor/setup.cfg b/contrib/nova_flavor/setup.cfg new file mode 100644 index 0000000000..77dc1ddcba --- /dev/null +++ b/contrib/nova_flavor/setup.cfg @@ -0,0 +1,27 @@ +[metadata] +name = heat-contrib-nova-flavor +summary = Heat resource for managing nova flavors +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] +# Copy to /usr/lib/heat for plugin loading +data_files = + lib/heat/nova_flavor = nova_flavor/resources/* + +[global] +setup-hooks = + pbr.hooks.setup_hook diff --git a/contrib/nova_flavor/setup.py b/contrib/nova_flavor/setup.py new file mode 100644 index 0000000000..736375744d --- /dev/null +++ b/contrib/nova_flavor/setup.py @@ -0,0 +1,30 @@ +#!/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) diff --git a/contrib/rackspace/README.md b/contrib/rackspace/README.md index 966a07a103..3959a35cbe 100644 --- a/contrib/rackspace/README.md +++ b/contrib/rackspace/README.md @@ -2,6 +2,21 @@ The resources and configuration in this module are for using Heat with the Rackspace Cloud. These resources either allow using Rackspace services that don't have equivalent services in OpenStack or account for differences between a generic OpenStack deployment and Rackspace Cloud. + +### 1. Install the Rackspace plugins 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. + + ## Resources The following resources are provided for compatibility: diff --git a/contrib/rackspace/setup.cfg b/contrib/rackspace/setup.cfg new file mode 100644 index 0000000000..53f8e3d6a0 --- /dev/null +++ b/contrib/rackspace/setup.cfg @@ -0,0 +1,27 @@ +[metadata] +name = heat-contrib-rackspace +summary = Heat resources for working with the Rackspace Cloud +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] +# Copy to /usr/lib/heat for plugin loading +data_files = + lib/heat/rackspace = rackspace/resources/* + +[global] +setup-hooks = + pbr.hooks.setup_hook diff --git a/contrib/rackspace/setup.py b/contrib/rackspace/setup.py new file mode 100644 index 0000000000..736375744d --- /dev/null +++ b/contrib/rackspace/setup.py @@ -0,0 +1,30 @@ +#!/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) diff --git a/doc/source/conf.py b/doc/source/conf.py index 7b436c865a..f2e30c6bdd 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -50,7 +50,7 @@ sys.path.insert(0, BASE_DIR) sys.path = PLUGIN_DIRS + sys.path cfg.CONF.import_opt('plugin_dirs', 'heat.common.config') -cfg.CONF.set_override(name='plugin_dirs', override=PLUGIN_DIRS) +#cfg.CONF.set_override(name='plugin_dirs', override=PLUGIN_DIRS) cfg.CONF.import_opt('environment_dir', 'heat.common.config') cfg.CONF.set_override(name='environment_dir', override=TEMP_ENV_DIR)