From bb4c91543462863cf8f6f6370aeb8180ecab75e4 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 4 May 2015 10:33:23 +1200 Subject: [PATCH] Do not specify version for contrib plugins The pbr 0.11.0 release has shown that having multiple trees in a repo each with their on version that is different to the git history is really not going to work. This change means that the version will be derived from git history, which will still be useful for operators managing what version of a plugin they have installed. Running sudo python setup.py install (as documented) is known to work with the latest pbr. Change-Id: I716a5374bb283d11e26459b5866a0437ab6fe0dd Closes-Bug: #1450733 --- contrib/cinder_volume_type/setup.cfg | 1 - contrib/extraroute/README.md | 8 +++++--- contrib/extraroute/setup.cfg | 1 - contrib/heat_barbican/setup.cfg | 1 - contrib/heat_docker/setup.cfg | 1 - contrib/heat_gnocchi/setup.cfg | 1 - contrib/heat_keystone/setup.cfg | 1 - contrib/heat_keystoneclient_v2/setup.cfg | 1 - contrib/heat_manila/setup.cfg | 1 - contrib/heat_mistral/setup.cfg | 1 - contrib/heat_zaqar/setup.cfg | 1 - contrib/nova_flavor/setup.cfg | 1 - contrib/rackspace/setup.cfg | 1 - 13 files changed, 5 insertions(+), 15 deletions(-) diff --git a/contrib/cinder_volume_type/setup.cfg b/contrib/cinder_volume_type/setup.cfg index 37df4376a0..2771554ede 100644 --- a/contrib/cinder_volume_type/setup.cfg +++ b/contrib/cinder_volume_type/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-cinder-volume-type -version = 0.1 summary = Heat resource for managing cinder volume_types description-file = README.md diff --git a/contrib/extraroute/README.md b/contrib/extraroute/README.md index d6f500a252..a6df3c858f 100644 --- a/contrib/extraroute/README.md +++ b/contrib/extraroute/README.md @@ -17,9 +17,11 @@ of the community discussion. ### 1. Install the ExtraRoute 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/extraroute/setup.cfg b/contrib/extraroute/setup.cfg index 987131a5ce..089827c6ea 100644 --- a/contrib/extraroute/setup.cfg +++ b/contrib/extraroute/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-extraroute -version = 0.1 summary = Heat resource for ExtraRoute description-file = README.md diff --git a/contrib/heat_barbican/setup.cfg b/contrib/heat_barbican/setup.cfg index 0631276b4c..e356e4026d 100644 --- a/contrib/heat_barbican/setup.cfg +++ b/contrib/heat_barbican/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-barbican -version = 0.1 summary = Heat resources for Barbican description-file = README.md diff --git a/contrib/heat_docker/setup.cfg b/contrib/heat_docker/setup.cfg index 179967ea7c..8f33e2b4e8 100644 --- a/contrib/heat_docker/setup.cfg +++ b/contrib/heat_docker/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-docker -version = 0.1 summary = Heat resource for Docker containers description-file = README.md diff --git a/contrib/heat_gnocchi/setup.cfg b/contrib/heat_gnocchi/setup.cfg index dd243872cc..d545527c0a 100644 --- a/contrib/heat_gnocchi/setup.cfg +++ b/contrib/heat_gnocchi/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-gnocchi -version = 0.1 summary = Heat resources for working gnocchi queues description-file = README.md diff --git a/contrib/heat_keystone/setup.cfg b/contrib/heat_keystone/setup.cfg index d43e14f21b..178a9996df 100644 --- a/contrib/heat_keystone/setup.cfg +++ b/contrib/heat_keystone/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-keystone -version = 0.1 summary = Heat resources for Keystone description-file = README.md diff --git a/contrib/heat_keystoneclient_v2/setup.cfg b/contrib/heat_keystoneclient_v2/setup.cfg index 7feb657c1a..5e34fd2791 100644 --- a/contrib/heat_keystoneclient_v2/setup.cfg +++ b/contrib/heat_keystoneclient_v2/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-keystone-v2 -version = 0.1 summary = Keystone V2 compatible client description-file = README.md diff --git a/contrib/heat_manila/setup.cfg b/contrib/heat_manila/setup.cfg index c2a19d3856..c4eede2512 100644 --- a/contrib/heat_manila/setup.cfg +++ b/contrib/heat_manila/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-manila -version = 0.1 summary = Heat resources for Manila description-file = README.md diff --git a/contrib/heat_mistral/setup.cfg b/contrib/heat_mistral/setup.cfg index 14218e0b85..7862b51d77 100644 --- a/contrib/heat_mistral/setup.cfg +++ b/contrib/heat_mistral/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-mistral -version = 0.1 summary = Heat resources for Mistral description-file = README.md diff --git a/contrib/heat_zaqar/setup.cfg b/contrib/heat_zaqar/setup.cfg index 1b4df0ccfb..35e7e7dea4 100644 --- a/contrib/heat_zaqar/setup.cfg +++ b/contrib/heat_zaqar/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-zaqar -version = 0.1 summary = Heat resources for working Zaqar queues description-file = README.md diff --git a/contrib/nova_flavor/setup.cfg b/contrib/nova_flavor/setup.cfg index 1f6eb18415..77dc1ddcba 100644 --- a/contrib/nova_flavor/setup.cfg +++ b/contrib/nova_flavor/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-nova-flavor -version = 0.1 summary = Heat resource for managing nova flavors description-file = README.md diff --git a/contrib/rackspace/setup.cfg b/contrib/rackspace/setup.cfg index 78a081a5cc..957fe2cee0 100644 --- a/contrib/rackspace/setup.cfg +++ b/contrib/rackspace/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = heat-contrib-rackspace -version = 0.1 summary = Heat resources for working with the Rackspace Cloud description-file = README.md