Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:zenoss/zenosslabs

  • Loading branch information...
commit 20cb0f999580aa3367e7fe1cccc22ce22b9ec781 2 parents 345886a + 5efca28
Simon authored
View
24 chef-repo/cookbooks/zenosslabs/attributes/default.rb
@@ -127,8 +127,8 @@
:packages => [
{
:name => "zenoss",
- :rpm_prefix => "zenoss-4.1.70-1421",
- :url_prefix => "http://artifacts.zenoss.loc/1421/"
+ :rpm_prefix => "zenoss-4.1.70-1443",
+ :url_prefix => "http://artifacts.zenoss.loc/1443/"
}
]
},{
@@ -136,12 +136,12 @@
:packages => [
{
:name => "zenoss",
- :rpm_prefix => "zenoss-4.1.70-1421",
- :url_prefix => "http://artifacts.zenoss.loc/1421/"
+ :rpm_prefix => "zenoss-4.1.70-1443",
+ :url_prefix => "http://artifacts.zenoss.loc/1443/"
},{
:name => "zenoss-core-zenpacks",
- :rpm_prefix => "zenoss-core-zenpacks-4.1.70-1421",
- :url_prefix => "http://artifacts.zenoss.loc/1421/"
+ :rpm_prefix => "zenoss-core-zenpacks-4.1.70-1443",
+ :url_prefix => "http://artifacts.zenoss.loc/1443/"
}
]
},{
@@ -150,16 +150,16 @@
:packages => [
{
:name => "zenoss",
- :rpm_prefix => "zenoss-4.1.70-1421",
- :url_prefix => "http://artifacts.zenoss.loc/1421/"
+ :rpm_prefix => "zenoss-4.1.70-1443",
+ :url_prefix => "http://artifacts.zenoss.loc/1443/"
},{
:name => "zenoss-core-zenpacks",
- :rpm_prefix => "zenoss-core-zenpacks-4.1.70-1421",
- :url_prefix => "http://artifacts.zenoss.loc/1421/"
+ :rpm_prefix => "zenoss-core-zenpacks-4.1.70-1443",
+ :url_prefix => "http://artifacts.zenoss.loc/1443/"
},{
:name => "zenoss-enterprise-zenpacks",
- :rpm_prefix => "zenoss-enterprise-zenpacks-4.1.70-1421",
- :url_prefix => "http://artifacts.zenoss.loc/1421/"
+ :rpm_prefix => "zenoss-enterprise-zenpacks-4.1.70-1443",
+ :url_prefix => "http://artifacts.zenoss.loc/1443/"
}
]
}
View
2  chef-repo/cookbooks/zenosslabs/files/default/zenpack_harness
@@ -177,7 +177,7 @@ class ZenPackHarness(object):
platform = pkg_resources.get_supported_platform()
python = pkg_resources.PY_MAJOR
- url_prefix = "http://192.168.4.4/api/download/"
+ url_prefix = "http://zenpacks.zenoss.com/api/download/"
url_suffix = "?zenoss_version=%s&platform=%s&python=%s" % (
self.zenoss_version, platform, python)
View
12 chef-repo/cookbooks/zenosslabs/files/default/zenpacks_server.wsgi
@@ -119,7 +119,15 @@ def matching_distributions(
# next loop finds this to not be the case.
z_compatible = True
- zenpack_info = distribution.get_metadata('zenpack_info')
+ # get_metadata can raise exceptions for improperly-formatted or
+ # corrupt eggs.
+ zenpack_info = None
+
+ try:
+ zenpack_info = distribution.get_metadata('zenpack_info')
+ except Exception:
+ continue
+
for line in pkg_resources.yield_lines(zenpack_info):
key, value = map(str.strip, line.split(':', 1))
if key == 'compatZenossVers':
@@ -154,7 +162,7 @@ def html_releases_list(key, zenoss_version, releases):
"""PyPI-compatible HTML listing of releases for a project."""
links = []
- for project, version in sorted(releases):
+ for project, version in sorted(releases, reverse=True):
links.append('<a href="/pypi/%s/%s/%s/%s">%s %s</a>' % (
key, zenoss_version, project, version, project, version))
View
2  chef-repo/cookbooks/zenosslabs/recipes/zenpack-build-server.rb
@@ -34,7 +34,7 @@
# Resources
-%w{lsof python-devel openldap-devel pcre-devel}.each do |pkg_name|
+%w{lsof python-devel openldap-devel pcre-devel autoconf}.each do |pkg_name|
package pkg_name
end
Please sign in to comment.
Something went wrong with that request. Please try again.