x/anvil
Code Issues Proposed changes

Large update for using apt-gets regex feature (thx apt!) and fixing new command added to keystone.

Browse Source
This commit is contained in:
Joshua Harlow
2012-01-27 13:59:16 -08:00
parent 909d309dc2
commit 2f801e1eb9
22 changed files with 226 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
conf/pkgs/db.json
View File

@@ -3,25 +3,22 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"mysql-client-5.1": { "mysql-client-5.1": {
"version": "5.1.58-1ubuntu1", "version": "5.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"mysql-server-core-5.1": { "mysql-server-core-5.1": {
"version": "5.1.58-1ubuntu1", "version": "5.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"mysql-common": { "mysql-common": {
"version": "5.1.58-1ubuntu1", "version": "5.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"mysql-server-5.1": { "mysql-server-5.1": {
"version": "5.1.58-1ubuntu1", "version": "5.1*",
"allowed": ">=",
"removable": true, "removable": true,
"pre-install": [ "pre-install": [
{ {
@@ -40,43 +37,6 @@
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly #TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# RHEL has a slightly different naming convention here
# and a different way of setting up the initial password.
# It also seems like ubuntu names the service mysql while RHEL names it mysqld (TODO fix this in code)
"mysql": {
"version": "5.1.52-1.el6_0.1",
"allowed": ">=",
"removable": true
},
"mysql-server": {
"version": "5.1.52-1.el6_0.1",
"allowed": ">=",
"removable": true,
"post-install": [
{
# Make sure it'll start on reboot
"run_as_root": true,
"cmd" : [ "chkconfig", "mysqld", "on"]
},
{
# Start the mysql service
"run_as_root": true,
"cmd" : [ "service", "mysqld", "start"]
},
{
# Set the root password
"run_as_root": true,
"cmd" : [ "mysqladmin", "-u", "root",
"password", "%PASSWORD%" ]
}
]
}
} }
} }

237
conf/pkgs/general.json
View File

@@ -3,301 +3,118 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"curl": { "curl": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "7.21.6-3ubuntu3" "version": "7.21.6*"
}, },
# Only for testing client # Only for testing client
"euca2ools": { "euca2ools": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "2.0.0~bzr464-0ubuntu2" "version": "2.0.0*"
}, },
"git": { "git": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "1:1.7.5.4-1" "version": "1:1*"
}, },
"gawk": { "gawk": {
"allowed": ">=", "version": "1:3*",
"version": "1:3.1.8+dfsg-0.1build1",
"removable": false "removable": false
}, },
"iputils-ping": { "iputils-ping": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "3:20101006-1" "version": "3:20101006*"
}, },
# Useful when debugging # Useful when debugging
"locate": { "locate": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "4.4.2-1ubuntu3" "version": "4.4.2*"
}, },
# Useful when debugging # Useful when debugging
"lsof": { "lsof": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "4.81.dfsg.1-1build1" "version": "4.81*"
}, },
"openssh-server": { "openssh-server": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "1:5.8p1-7ubuntu1" "version": "1:5.8*"
}, },
"pep8": { "pep8": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "0.6.1-2ubuntu1" "version": "0.6.1*"
}, },
"psmisc": { "psmisc": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "22.14-1" "version": "22.14*"
}, },
"pylint": { "pylint": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "0.23.0-1" "version": "0.23*"
}, },
"python": { "python": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "2.7.2-7ubuntu2" "version": "2.7.2*"
}, },
# For testing # For testing
"python-coverage": { "python-coverage": {
"allowed": ">=",
"removable": true, "removable": true,
"version": "3.4-1" "version": "3.4*"
}, },
"python-pip": { "python-pip": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "1.0-1" "version": "1.0*"
}, },
# For testing # For testing
"python-unittest2": { "python-unittest2": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "0.5.1-1" "version": "0.5.1*"
}, },
# For testing # For testing
"python-virtualenv": { "python-virtualenv": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "1.6.4-0ubuntu1" "version": "1.6.4*"
}, },
"python-setuptools": { "python-setuptools": {
"version": "0.6.16-1", "version": "0.6.16*",
"allowed": ">=",
"removable": false "removable": false
}, },
"python-dev": { "python-dev": {
"version": "2.7.2-7ubuntu2", "version": "2.7.2*",
"allowed": ">=",
"removable": false "removable": false
}, },
# For testing # For testing
"python-nose": { "python-nose": {
"version": "1.0.0-1ubuntu1", "version": "1.0.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
# For testing # For testing
"python-mox": { "python-mox": {
"version": "0.5.3-1ubuntu4", "version": "0.5.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"screen": { "screen": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "4.0.3-14ubuntu8" "version": "4.0.3*"
}, },
"sudo": { "sudo": {
"allowed": ">=",
"removable": false, "removable": false,
"version" : "1.7.4p6-1ubuntu2" "version" : "1.7.4*"
}, },
"tcpdump": { "tcpdump": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "4.1.1-2ubuntu2" "version": "4.1.1*"
}, },
"unzip": { "unzip": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "6.0-4ubuntu1" "version": "6.0*"
}, },
"wget": { "wget": {
"allowed": ">=",
"removable": false, "removable": false,
"version": "1.12-3.1ubuntu1" "version": "1.12*"
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
"curl": {
"allowed": ">=",
"removable": false,
"version": "7.19.7-26.el6_1.2"
},
# Only for testing client
"euca2ools": {
# Requires EPEL repo
"allowed": ">=",
"removable": false,
# This version is vastly different than the ubuntu one, we might need a new package!
"version": "1.3.1-12.el6"
},
"git": {
"allowed": ">=",
"removable": false,
"version": "1.7.1-2.el6_0.1"
},
"gawk": {
"allowed": ">=",
"version": "3.1.7-6.el6",
"removable": false
},
"iputils": {
# RHEL doesn't separate it into iputils-ping and such so this package should have them all.
"allowed": ">=",
"removable": false,
"version": "20071127-16.el6"
},
# Useful when debugging
"mlocate": {
# RHEL mlocate seems to be the locate command
"allowed": ">=",
"removable": false,
"version": "0.22.2-3.el6"
},
"lsof": {
"allowed": ">=",
"removable": false,
"version": "4.82-1.2.el6"
},
"openssh-server": {
"allowed": ">=",
"removable": false,
"version": "5.3p1-52.el6"
},
"python-pep8": {
# Requires EPEL repo
"allowed": ">=",
"removable": false,
"version": "0.6.0-2.el6"
},
"psmisc": {
"allowed": ">=",
"removable": false,
"version": "22.6-15.el6_0.1"
},
"pylint": {
# Requires EPEL repo
"allowed": ">=",
"removable": false,
# Version difference should not be critical
"version": "0.21.1-2.el6"
},
"python": {
"allowed": ">=",
"removable": false,
# Version difference should not be critical
# Openstack should work with 2.6 (if not we have a problem)
"version": "2.6.6-20.el6"
},
"python-setuptools": {
"version": "0.6.10-3.el6",
"allowed": ">=",
"removable": false
},
# RHEL names this one differently
"python-devel": {
"version": "2.6.6-20.el6",
"allowed": ">=",
"removable": false
},
# No python code coverage (python-coverage) yet (definitely need a package for that)
# especially if you want to run code coverage utilities!
#
#"python-coverage": {
# "allowed": ">=",
# "removable": true,
# "version": "???"
#},
"python-pip": {
# Requires EPEL repo
"allowed": ">=",
"removable": false,
# This version is pretty different than the ubuntu one, might need to repackage
"version": "0.8-1.el6"
},
# For testing
"python-unittest2": {
# Requires EPEL repo
"allowed": ">=",
"removable": false,
"version": "0.5.1-3.el6"
},
# For testing
"python-virtualenv": {
# Requires EPEL repo
"allowed": ">=",
"removable": false,
# Version difference should not be critical (it seems newer on EPEL)
"version": "1.7-1.el6"
},
# For testing
"python-nose": {
# This version seems to be way off. Unsure what this means.
# Grid dynamics repo lists python-nose-1.0.0-2.noarch
# and also python-nose-0.11.3-5.el6.noarch. Not sure about this.
"version": "0.10.4-3.1.el6",
"allowed": ">=",
"removable": true
},
# For testing
# Requires EPEL repo
"python-mox": {
"version": "0.5.3-2.el6",
"allowed": ">=",
"removable": true
},
"screen": {
"allowed": ">=",
"removable": false,
"version": "4.0.3-16.el6"
},
"sudo": {
"allowed": ">=",
"removable": false,
"version" : "1.7.4p5-5.el6"
},
"tcpdump": {
"allowed": ">=",
"removable": false,
"version": "tcpdump-4.0.0-3.20090921gitdf3cb4.1.el6"
},
"unzip": {
"allowed": ">=",
"removable": false,
"version": "6.0-1.el6"
},
"wget": {
"allowed": ">=",
"removable": false,
"version": "1.12-1.4.el6"
}
} }
} }

113
conf/pkgs/glance.json
View File

@@ -3,137 +3,46 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-eventlet": { "python-eventlet": {
"version": "0.9.15-0ubuntu4", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-routes": { "python-routes": {
"version": "1.12.3-1", "version": "1.12*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-greenlet": { "python-greenlet": {
"version": "0.3.1-1ubuntu4", "version": "0.3.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-argparse": { "python-argparse": {
"version": "1.1-1ubuntu1", "version": "1.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-mysqldb": { "python-mysqldb": {
"version": "1.2.3-0ubuntu1", "version": "1.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-sqlalchemy": { "python-sqlalchemy": {
"version": "0.6.8-1", "version": "0.6.8*",
"allowed": ">=",
"removable": true "removable": true
}, },
# This seems connected to the main python (so we can't remove it)
#"python-wsgiref": {
# "version": "2.7.2-7ubuntu2",
# "allowed": ">=",
# "removable": false
#},
"python-pastedeploy": { "python-pastedeploy": {
"version": "1.5.0-2", "version": "1.5.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-xattr": { "python-xattr": {
"version": "0.6-1ubuntu2", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-httplib2": { "python-httplib2": {
"version": "0.7.1-1ubuntu1", "version": "0.7.1*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Requires EPEL repo
"python-eventlet": {
"version": "0.9.16-3.el6",
"allowed": ">=",
"removable": true
},
"python-routes": {
# This version might not be ok?
# Grid dynamics repo lists 1.12.3-2.el6 (we might need to also)
"version": "1.10.3-2.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-greenlet": {
"version": "0.3.1-6.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-argparse": {
# This version is newer than ubuntu, that should be ok?
"version": "1.2.1-2.el6",
"allowed": ">=",
"removable": true
},
# RHEL names this one differently. Why?
"MySQL-python": {
"version": "1.2.3-0.3.c1.1.el6",
"allowed": ">=",
"removable": true
},
"python-sqlalchemy": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 0.6.4-2.el6 (we might need to also)
"version": "0.5.5-2.1.el6",
"allowed": ">=",
"removable": true
},
# This does not seem to exist yet.
# It seemed to have been in RHEL5 though.
# http://pkgs.org/centos-5-rhel-5/epel-i386/python-wsgiref-0.1.2-3.el5.noarch.rpm.html
# Where did it go?
#
# "python-wsgiref": {
# "version": "???",
# "allowed": ">=",
# "removable": false
# },
# RHEL names this one differently. Why?
"python-paste-deploy": {
# This version is behind by alot. We might need to repackage it.
"version": "1.3.3-2.1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-xattr": {
# This version is behind by alot. We might need to repackage it.
"version": "0.5.0-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-httplib2": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 0.7.1-2.2 (we might need to also)
"version": "0.4.0-5.el6",
"allowed": ">=",
"removable": true
}
} }
} }

198
conf/pkgs/horizon.json
View File

@@ -3,245 +3,89 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"apache2": { "apache2": {
"version": "2.2.20-1ubuntu1.1", "version": "2.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
"libapache2-mod-wsgi": { "libapache2-mod-wsgi": {
"version": "3.3-2ubuntu3", "version": "3.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-dateutil": { "python-dateutil": {
"version": "1.4.1-4", "version": "1.4*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-paste": { "python-paste": {
"version": "1.7.5.1-4ubuntu1", "version": "1.7.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-pastedeploy": { "python-pastedeploy": {
"version": "1.5.0-2", "version": "1.5.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-routes": { "python-routes": {
"version": "1.12.3-1", "version": "1.12*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-xattr": { "python-xattr": {
"version": "0.6-1ubuntu2", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-sqlalchemy": { "python-sqlalchemy": {
"version": "0.6.8-1", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-webob": { "python-webob": {
"version": "1.0.8-1", "version": "1.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-kombu": { "python-kombu": {
"version": "1.0.4-2", "version": "1.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-eventlet": { "python-eventlet": {
"version": "0.9.15-0ubuntu4", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-sphinx": { "python-sphinx": {
"version": "1.0.7+dfsg-1", "version": "1.0.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-cherrypy3": { "python-cherrypy3": {
"version": "3.1.2-1", "version": "3.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-django": { "python-django": {
"version": "1.3-2ubuntu1", "version": "1.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-django-mailer": { "python-django-mailer": {
"version": "0.2a1.dev3-0ubuntu1", "version": "0.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Is this really needed? # Is this really needed?
"python-django-nose": { "python-django-nose": {
"version": "0.1.2-2", "version": "0.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-django-registration": { "python-django-registration": {
"version": "0.7-2", "version": "0.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Is this really needed? # Is this really needed?
# Why is a rackspace api package here? # Why is a rackspace api package here?
"python-cloudfiles": { "python-cloudfiles": {
"version": "1.7.9.2-0ubuntu1", "version": "1.7.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-migrate": { "python-migrate": {
"version": "0.7.1-1", "version": "0.7*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly #TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# This is apache for rhel
"httpd": {
"version": "2.2.15-9.el6",
"allowed": ">=",
"removable": true
},
"mod_wsgi": {
# This version is behind by 1 whole version
# This might not be ok?
"version": "3.2-1.el6",
"allowed": ">=",
"removable": true
},
"python-dateutil": {
"version": "1.4.1-6.el6",
"allowed": ">=",
# TBD hopefully this doesn't affect the base system
# Does yum use this?
"removable": false
},
"python-paste": {
# This version is slightly behind.
# This might not be ok?
"version": "1.7.4-1.el6",
"allowed": ">=",
"removable": true
},
"python-paste-deploy": {
# This version is behind by alot. We might need to repackage it.
"version": "1.3.3-2.1.el6",
"allowed": ">=",
"removable": true
},
"python-routes": {
# This version might not be ok?
# Grid dynamics repo lists 1.12.3-2.el6 (we might need to also)
"version": "1.10.3-2.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-xattr": {
# This version is behind by alot. We might need to repackage it.
"version": "0.5.0-1.el6",
"allowed": ">=",
"removable": true
},
"python-sqlalchemy": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 0.6.4-2.el6 (we might need to also)
"version": "0.5.5-2.1.el6",
"allowed": ">=",
"removable": true
},
"python-webob": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 1.0.8-1.el6 (we might need to also)
"version": "0.9.6.1-3.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-kombu": {
# This version is ahead of ubuntu.
# That might not be ok?
"version": "1.1.3-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-eventlet": {
"version": "0.9.16-3.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-sphinx": {
# This version is ahead of ubuntu.
"version": "1.0.8-1.el6",
"allowed": ">=",
"removable": true
},
# Does not seem to exist yet.
#
# EPEL has python-cherrypy2 but this probably won't work?
#"python-cherrypy3": {
# "version": "3.1.2-1",
# "allowed": ">=",
# "removable": true
#},
"Django": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 1.3-2 (we might need to also)
"version": "1.2.7-1.el6",
"allowed": ">=",
"removable": true
},
# This does not seem to exist.
# Grid dynamics repo lists django-mailer-0.1.0-1.8
#"python-django-mailer": {
# "version": "???",
# "allowed": ">=",
# "removable": true
#},
#
# This does not seem to exist.
# Grid dynamics repo lists django-nose-0.1.2.
#"python-django-nose": {
# "version": "???",
# "allowed": ">=",
# "removable": true
#},
# Requires EPEL repo
"django-registration": {
"version": "0.7-2.el6",
"allowed": ">=",
"removable": true
},
# Is this really needed?
# Requires EPEL repo
"python-cloudfiles": {
"version": "1.7.9.1-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-migrate": {
# This version is behind by alot. We might need to repackage it.
"version": "0.6-6.el6",
"allowed": ">=",
"removable": true
}
} }
} }

34
conf/pkgs/keystone-client.json
View File

@@ -3,44 +3,18 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-prettytable": { "python-prettytable": {
"version": "0.5-1ubuntu1", "version": "0.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Not needed unless less than python 2.6 (not our case)
#"python-simplejson": {
# "version": "2.1.6-1",
# "allowed": ">=",
# "removable": true
#},
"python-argparse": { "python-argparse": {
"version": "1.1-1ubuntu1", "version": "1.1*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Requires EPEL repo
"python-prettytable": {
"version": "0.5-2.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-argparse": {
# This version is ahead of ubuntu.
"version": "1.2.1-2.el6",
"allowed": ">=",
"removable": true
}
} }
} }

151
conf/pkgs/keystone.json
View File

@@ -3,188 +3,81 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-eventlet": { "python-eventlet": {
"version": "0.9.15-0ubuntu4", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-lxml": { "python-lxml": {
"version": "2.3-0.1build1", "version": "2.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-pastescript": { "python-pastescript": {
"version": "1.7.3-7", "version": "1.7*",
"allowed": ">=", "removable": true
},
"python-prettytable": {
"version": "0.5*",
"removable": true "removable": true
}, },
"python-mysqldb": { "python-mysqldb": {
"version": "1.2.3-0ubuntu1", "version": "1.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-migrate": { "python-migrate": {
"version": "0.7.1-1", "version": "0.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-pastedeploy": { "python-pastedeploy": {
"version": "1.5.0-2", "version": "1.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-paste": { "python-paste": {
"version": "1.7.5.1-4ubuntu1", "version": "1.7.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
"sqlite3": { "sqlite3": {
"version": "3.7.7-2ubuntu2", "version": "3.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-pysqlite2": { "python-pysqlite2": {
"version": "2.6.3-2", "version": "2.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-sqlalchemy": { "python-sqlalchemy": {
"version": "0.6.8-1", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-webob": { "python-webob": {
"version": "1.0.8-1", "version": "1.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-greenlet": { "python-greenlet": {
"version": "0.3.1-1ubuntu4", "version": "0.3*",
"allowed": ">=", "allowed": ">=",
"removable": true "removable": true
}, },
"python-routes": { "python-routes": {
"version": "1.12.3-1", "version": "1.12*",
"allowed": ">=", "allowed": ">=",
"removable": true "removable": true
}, },
"libldap2-dev": { "libldap2-dev": {
"removable": true, "removable": true,
"version": "2.4.25-1.1ubuntu4.1", "version": "2.4*",
"removable": true "removable": true
}, },
"libsasl2-dev": { "libsasl2-dev": {
"version": "2.1.24~rc1.dfsg1+cvs2011-05-23-4ubuntu2", "version": "2.1*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-migrate": { "python-migrate": {
"version": "0.7.1-1", "version": "0.7*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Requires EPEL repo
"python-eventlet": {
"version": "0.9.16-3.el6",
"allowed": ">=",
"removable": true
},
"python-lxml": {
# This version is pretty different than the ubuntu one, might need to repackage
"version": "2.2.3-1.1.el6",
"allowed": ">=",
"removable": true
},
"python-paste-script": {
"version": "1.7.3-4",
"allowed": ">=",
"removable": true
},
# RHEL names this one differently. Why?
"MySQL-python": {
"version": "1.2.3-0.3.c1.1.el6",
"allowed": ">=",
"removable": true
},
"python-paste-deploy": {
# This version is behind by alot. We might need to repackage it.
"version": "1.3.3-2.1.el6",
"allowed": ">=",
"removable": true
},
"python-paste": {
# This version is slightly behind.
# This might not be ok?
"version": "1.7.4-1.el6",
"allowed": ">=",
"removable": true
},
"sqlite": {
# This version is a little bit behind
# That should be ok?
"version": "3.6.20-1.el6",
"allowed": ">=",
# Seems to attempt to remove yum, not good
"removable": false
},
# Requires EPEL repo
"python-sqlite2": {
# This version is behind by alot. We might need to repackage it.
"version": "2.3.5-2.el6",
"allowed": ">=",
"removable": true
},
"python-sqlalchemy": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 0.6.4-2.el6 (we might need to also)
"version": "0.5.5-2.1.el6",
"allowed": ">=",
"removable": true
},
"python-webob": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 1.0.8-1.el6 (we might need to also)
"version": "0.9.6.1-3.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-greenlet": {
"version": "0.3.1-6.el6",
"allowed": ">=",
"removable": true
},
"python-routes": {
# This version might not be ok?
# Grid dynamics repo lists 1.12.3-2.el6 (we might need to also)
"version": "1.10.3-2.el6",
"allowed": ">=",
"removable": true
},
# What is the equivalent of this (libldap2-dev) in rhel?
# Is this right?
"openldap": {
"version": "2.4.23-15.el6",
"allowed": ">=",
# Seems to attempt to remove yum, not good
"removable": false
},
# What is the equivalent of this (libsasl2-dev) in rhel?
"cyrus-sasl-lib": {
"version": "2.1.23-8.el6",
"allowed": ">=",
# Seems to attempt to remove yum, not good
"removable": false
}
} }
} }

11
conf/pkgs/n-api.json
View File

@@ -3,19 +3,14 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-dateutil": { "python-dateutil": {
"version": "1.4.1-4", "version": "1.4*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
} }
} }

28
conf/pkgs/n-cpu.json
View File

@@ -3,41 +3,23 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
# Stuff for diablo volumes # Stuff for diablo volumes
"lvm2": { "lvm2": {
"version": "2.02.66-4ubuntu3", "version": "2.02*",
"allowed": ">=",
"removable": true "removable": true
}, },
"open-iscsi": { "open-iscsi": {
"version": "2.0.871-0ubuntu8", "version": "2.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"open-iscsi-utils": { "open-iscsi-utils": {
"version": "2.0.871-0ubuntu8", "version": "2.0*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
"lvm2": {
"version": "2.02.83-3.el6",
"allowed": ">=",
"removable": true
},
# This seems to be the equivalent to open-iscsi in RHEL
"iscsi-initiator-utils": {
"version": "6.2.0.872-21.el6",
"allowed": ">=",
"removable": true
}
} }
} }

19
conf/pkgs/n-vnc.json
View File

@@ -3,29 +3,16 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
# This seems like an odd dependency. # This seems like an odd dependency.
# Novnc requires "scientific computing tools for python"? (weird) # Novnc requires "scientific computing tools for python"? (weird)
"python-numpy": { "python-numpy": {
"version": "1:1.5.1-2ubuntu2", "version": "1:1.5*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Does not exist yet. It seems like people
# have built this just it isn't in RHEL or EPEL. We need this...
# "python-numpy": {
# "version": "??",
# "allowed": ">=",
# "removable": true
# }
} }
} }

28
conf/pkgs/n-vol.json
View File

@@ -3,42 +3,24 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
# Linux SCSI target framework # Linux SCSI target framework
"tgt": { "tgt": {
"version": "1:1.0.17-1ubuntu1", "version": "1:1*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Need for ietadm, which is run by stack script # Need for ietadm, which is run by stack script
"iscsitarget": { "iscsitarget": {
"version": "1.4.20.2-5ubuntu1", "version": "1.4*",
"allowed": ">=",
"removable": true "removable": true
}, },
"lvm2": { "lvm2": {
"version": "2.02.66-4ubuntu3", "version": "2.02*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
"lvm2": {
"version": "2.02.83-3.el6",
"allowed": ">=",
"removable": true
},
# This seems to be the tgt package from ubuntu?
"scsi-target-utils": {
"version": "1.0.14-2.el6",
"allowed": ">=",
"removable": true
}
} }
} }

34
conf/pkgs/nova-client.json
View File

@@ -3,44 +3,18 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-prettytable": { "python-prettytable": {
"version": "0.5-1ubuntu1", "version": "0.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Not needed unless less than python 2.6 (not our case)
#"python-simplejson": {
# "version": "2.1.6-1",
# "allowed": ">=",
# "removable": true
#},
"python-argparse": { "python-argparse": {
"version": "1.1-1ubuntu1", "version": "1.1*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Requires EPEL repo
"python-prettytable": {
"version": "0.5-2.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-argparse": {
# This version is ahead of ubuntu.
"version": "1.2.1-2.el6",
"allowed": ">=",
"removable": true
}
} }
} }

319
conf/pkgs/nova.json
View File

@@ -3,26 +3,23 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"dnsmasq-base": { "dnsmasq-base": {
"version": "2.57-1ubuntu1", "version": "2.57*",
"allowed": ">=",
"removable": true "removable": true
}, },
# For dhcp_release only available in dist:oneiric # For dhcp_release only available in dist:oneiric
"dnsmasq-utils": { "dnsmasq-utils": {
"version": "2.57-1ubuntu1", "version": "2.57*",
"allowed": ">=",
"removable": true "removable": true
}, },
"kpartx": { "kpartx": {
"version": "0.4.9-2ubuntu1", "version": "0.4*",
"allowed": ">=",
"removable": true "removable": true
}, },
"parted": { "parted": {
"version": "2.3-6ubuntu3", "version": "2.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Only available in dist:natty?? # Only available in dist:natty??
@@ -34,107 +31,87 @@
# #
# Only available in dist:oneiric?? # Only available in dist:oneiric??
"iputils-arping": { "iputils-arping": {
"version": "3:20101006-1", "version": "3:20101006*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-mysqldb": { "python-mysqldb": {
"version": "1.2.3-0ubuntu1", "version": "1.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Needed for glance which is needed for nova --- this shouldn't be here # Needed for glance which is needed for nova --- this shouldn't be here
"python-xattr": { "python-xattr": {
"version": "0.6-1ubuntu2", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Needed for glance which is needed for nova --- this shouldn't be here # Needed for glance which is needed for nova --- this shouldn't be here
"python-lxml": { "python-lxml": {
"version": "2.3-0.1build1", "version": "2.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Only really needed if you plan on using kvm # Only really needed if you plan on using kvm
"kvm": { "kvm": {
"version": "1:84+dfsg-0ubuntu16+0.14.1+noroms+0ubuntu6.2", "version": "1:84*",
"allowed": ">=",
"removable": true "removable": true
}, },
"iptables": { "iptables": {
"version": "1.4.10-1ubuntu1", "version": "1.4*",
"allowed": ">=",
"removable": false "removable": false
}, },
"ebtables": { "ebtables": {
"version": "2.0.9.2-2", "version": "2.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"sqlite3": { "sqlite3": {
"version": "3.7.7-2ubuntu2", "version": "3.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"libvirt-bin": { "libvirt-bin": {
"version": "0.9.2-4ubuntu15.1", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"libvirt0": { "libvirt0": {
"version": "0.9.2-4ubuntu15.1", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"vlan": { "vlan": {
"version": "1.9-3ubuntu3", "version": "1.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Used by ajaxterm # Used by ajaxterm
"socat": { "socat": {
"version": "1.7.1.3-1.1ubuntu1", "version": "1.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-paste": { "python-paste": {
"version": "1.7.5.1-4ubuntu1", "version": "1.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-migrate": { "python-migrate": {
"version": "0.7.1-1", "version": "0.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-gflags": { "python-gflags": {
"version": "1.5.1-1", "version": "1.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-greenlet": { "python-greenlet": {
"version": "0.3.1-1ubuntu4", "version": "0.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-libvirt": { "python-libvirt": {
"version": "0.9.2-4ubuntu15", "version": "0.9.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-libxml2": { "python-libxml2": {
"version": "2.7.8.dfsg-4", "version": "2.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-routes": { "python-routes": {
"version": "1.12.3-1", "version": "1.12*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-netaddr": { "python-netaddr": {
"version": "0.7.5-4", "version": "0.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-pastedeploy": { "python-pastedeploy": {
@@ -143,273 +120,51 @@
"removable": true "removable": true
}, },
"python-eventlet": { "python-eventlet": {
"version": "0.9.15-0ubuntu4", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-cheetah": { "python-cheetah": {
"version": "2.4.4-2ubuntu1", "version": "2.4*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-carrot": { "python-carrot": {
"version": "0.10.7-0ubuntu1", "version": "0.10*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-tempita": { "python-tempita": {
"version": "0.5.1-1", "version": "0.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-sqlalchemy": { "python-sqlalchemy": {
"version": "0.6.8-1", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-suds": { "python-suds": {
"version": "0.4.1-2", "version": "0.4*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-lockfile": { "python-lockfile": {
"version": "1:0.8-2", "version": "1:0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-m2crypto": { "python-m2crypto": {
"version": "0.20.1+dfsg1-1.1ubuntu1", "version": "0.20*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-boto": { "python-boto": {
"version": "2.0-0ubuntu1", "version": "2.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-kombu": { "python-kombu": {
"version": "1.0.4-2", "version": "1.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-feedparser": { "python-feedparser": {
"version": "5.0.1-1", "version": "5.0*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
"dnsmasq": {
"version": "2.48-4.el6",
"allowed": ">=",
"removable": true
},
"kpartx": {
"version": "0.4.9-41.el6",
"allowed": ">=",
"removable": false
},
"parted": {
"version": "2.1-13.el6",
"allowed": ">=",
"removable": false
},
"iputils": {
"version": "20071127-16.el6",
"allowed": ">=",
"removable": true
},
# RHEL names this one differently. Why?
"MySQL-python": {
"version": "1.2.3-0.3.c1.1.el6",
"allowed": ">=",
"removable": true
},
"python-xattr": {
# This version is behind by alot. We might need to repackage it.
"version": "0.5.0-1.el6",
"allowed": ">=",
"removable": true
},
"python-lxml": {
# This version is pretty different than the ubuntu one, might need to repackage
"version": "2.2.3-1.1.el6",
"allowed": ">=",
"removable": true
},
# Only really needed if you plan on using kvm
# This also typically pulls a lot of other packages in...
"kvm": {
"version": "0.12.1.2-2.160.el6",
"allowed": ">=",
"removable": true
},
"iptables": {
"version": "1.4.7-4.el6",
"allowed": ">=",
# This tries to remove a ton (?? ok ??)
"removable": false
},
"ebtables": {
"version": "2.0.9-6.el6",
"allowed": ">=",
"removable": true
},
"sqlite": {
# This version is a little bit behind
# That should be ok?
"version": "3.6.20-1.el6",
"allowed": ">=",
# Seems to attempt to remove yum, not good
"removable": false
},
"libvirt": {
# This version is behind by alot. We might need to repackage it.
"version": "0.8.7-18.el6",
"allowed": ">=",
"removable": true
},
# What is this package in rhel??
#"vlan": {
# "version": "???",
# "allowed": ">=",
# "removable": true
#},
# Requires EPEL repo
"socat": {
"version": "1.7.1.3-1.el6",
"allowed": ">=",
"removable": true
},
"python-paste": {
# This version is slightly behind.
# This might not be ok?
"version": "1.7.4-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-migrate": {
# This version is behind by alot. We might need to repackage it.
"version": "0.6-6.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-gflags": {
# This version is slightly behind.
# This might not be ok?
"version": "1.4-3.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-greenlet": {
"version": "0.3.1-6.el6",
"allowed": ">=",
"removable": true
},
"libvirt-python": {
# This version is behind by alot. We might need to repackage it.
"version": "0.8.7-18.el6",
"allowed": ">=",
"removable": true
},
"python-libxml2": {
"version": "2.7.6-1.el6",
"allowed": ">=",
"removable": true
},
"python-routes": {
# This version might not be ok?
# Grid dynamics repo lists 1.12.3-2.el6 (we might need to also)
"version": "1.10.3-2.el6",
"allowed": ">=",
"removable": true
},
"python-netaddr": {
"version": "0.7.5-3.el6",
"allowed": ">=",
"removable": true
},
"python-paste-deploy": {
# This version is behind by alot. We might need to repackage it.
"version": "1.3.3-2.1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-eventlet": {
"version": "0.9.16-3.el6",
"allowed": ">=",
"removable": true
},
"python-cheetah": {
"version": "2.4.1-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-carrot": {
"version": "0.10.7-2.el6",
"allowed": ">=",
"removable": true
},
"python-tempita": {
# This version is behind by alot. We might need to repackage it.
"version": "0.4-2.el6",
"allowed": ">=",
"removable": true
},
"python-sqlalchemy": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 0.6.4-2.el6 (we might need to also)
"version": "0.5.5-2.1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-suds": {
"version": "0.4.1-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-lockfile": {
# Is this version ok???
"version": "0.8-3.el6",
"allowed": ">=",
"removable": true
},
"m2crypto": {
"version": "0.20.2-7.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-boto": {
"version": "2.0-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-kombu": {
"version": "1.1.3-1.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-feedparser": {
"version": "5.0.1-1.el6",
"allowed": ">=",
"removable": true
}
} }
} }

26
conf/pkgs/openstackx.json
View File

@@ -3,34 +3,14 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-httplib2": { "python-httplib2": {
"version": "0.7.1-1ubuntu1", "version": "0.7*",
"allowed": ">=",
"removable": true "removable": true
} }
# Not needed unless less than python 2.6 (not our case)
#"python-simplejson": {
# "version": "2.1.6-1",
# "allowed": ">=",
# "removable": true
#},
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Requires EPEL repo
"python-httplib2": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 0.7.1-2.2 (we might need to also)
"version": "0.4.0-5.el6",
"allowed": ">=",
"removable": true
}
} }
} }

4
conf/pkgs/quantum-client.json
View File

@@ -3,10 +3,10 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-gflags": { "python-gflags": {
"version": "1.5.1-1", "version": "1.5*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },

13
conf/pkgs/quantum-openvswitch.json
View File

@@ -3,26 +3,23 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"openvswitch-switch": { "openvswitch-switch": {
"version": "1.2.0-1ubuntu3", "version": "1.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
"openvswitch-datapath-dkms": { "openvswitch-datapath-dkms": {
"version": "1.2.0-1ubuntu3", "version": "1.2*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Seems needed for ovs_quantum_agent.py # Seems needed for ovs_quantum_agent.py
"python-sqlalchemy": { "python-sqlalchemy": {
"version": "0.6.8-1", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-mysqldb": { "python-mysqldb": {
"version": "1.2.3-0ubuntu1", "version": "1.2*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },

22
conf/pkgs/quantum.json
View File

@@ -3,40 +3,34 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"python-eventlet": { "python-eventlet": {
"version": "0.9.15-0ubuntu4", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-greenlet": { "python-greenlet": {
"version": "0.3.1-1ubuntu4", "version": "0.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-routes": { "python-routes": {
"version": "1.12.3-1", "version": "1.12*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-lxml": { "python-lxml": {
"version": "2.3-0.1build1", "version": "2.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-paste": { "python-paste": {
"version": "1.7.5.1-4ubuntu1", "version": "1.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-gflags": { "python-gflags": {
"version": "1.5.1-1", "version": "1.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-pastedeploy": { "python-pastedeploy": {
"version": "1.5.0-2", "version": "1.5*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },

19
conf/pkgs/rabbitmq.json
View File

@@ -3,27 +3,14 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
"rabbitmq-server": { "rabbitmq-server": {
"version": "2.5.0-1ubuntu2", "version": "2.5*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Requires EPEL repo
"rabbitmq-server": {
# This version is ahead of ubuntu.
"version": "2.6.1-1.el6",
"allowed": ">=",
"removable": true
}
} }
} }

124
conf/pkgs/swift.json
View File

@@ -3,154 +3,56 @@
{ {
# This is currently our "master" repo set with versions # This is currently our "master" repo set with versions
# that we are trying to align other distributions with. # that we are trying to align other distributions with.
# The versions should at least be major + minor!
"ubuntu-oneiric": { "ubuntu-oneiric": {
# Is this really needed? # Is this really needed?
"gcc": { "gcc": {
"version": "4:4.6.1-2ubuntu5", "version": "4:4.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
# This may not always be needed (maybe have code not always install this) - or add a new key in that is used for this # This may not always be needed (maybe have code not always install this) - or add a new key in that is used for this
"memcached": { "memcached": {
"version": "1.4.7-0.1ubuntu1", "version": "1.4*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-configobj": { "python-configobj": {
"version": "4.7.2+ds-3", "version": "4.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-eventlet": { "python-eventlet": {
"version": "0.9.15-0ubuntu4", "version": "0.9*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-greenlet": { "python-greenlet": {
"version": "0.3.1-1ubuntu4", "version": "0.3*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-netifaces": { "python-netifaces": {
"version": "0.5-2.1ubuntu2", "version": "0.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-pastedeploy": { "python-pastedeploy": {
"version": "1.5.0-2", "version": "1.5*",
"allowed": ">=",
"removable": true "removable": true
}, },
# Not needed unless less than python 2.6 (not our case)
#"python-simplejson": {
# "version": "2.1.6-1",
# "allowed": ">=",
# "removable": true
#},
"python-webob": { "python-webob": {
"version": "1.0.8-1", "version": "1.0*",
"allowed": ">=",
"removable": true "removable": true
}, },
"python-xattr": { "python-xattr": {
"version": "0.6-1ubuntu2", "version": "0.6*",
"allowed": ">=",
"removable": true "removable": true
}, },
"sqlite3": { "sqlite3": {
"version": "3.7.7-2ubuntu2", "version": "3.7*",
"allowed": ">=",
"removable": true "removable": true
}, },
"xfsprogs": { "xfsprogs": {
"version": "3.1.5ubuntu1", "version": "3.1*",
"allowed": ">=",
"removable": true "removable": true
} }
}, },
"rhel-6": { "rhel-6": {
# Unless otherwise noted the versions may be slightly # TBD
# different, but for common utilities this should not be a critical
# issue unless determined otherwise.
#
# If a package requires EPEL repo please follow instructions
# at http://fedoraproject.org/wiki/EPEL to ensure the repo is in /etc/yum.repos.d/
#
# Is this really needed?
"gcc": {
"version": "4.4.5-6.el6",
"allowed": ">=",
"removable": true
},
# This may not always be needed (maybe have code not always install this) - or add a new key in that is used for this
"memcached": {
"version": "1.4.4-3.el6",
"allowed": ">=",
"removable": true
},
"python-configobj": {
# This version is a little bit behind ubuntu
# That might be ok?
"version": "4.6.0-3.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-eventlet": {
"version": "0.9.16-3.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-greenlet": {
"version": "0.3.1-6.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-netifaces": {
"version": "0.5-1.el6",
"allowed": ">=",
"removable": true
},
"python-paste-deploy": {
# This version is behind by alot. We might need to repackage it.
"version": "1.3.3-2.1.el6",
"allowed": ">=",
"removable": true
},
# Not needed unless less than python 2.6 (not our case)
#"python-simplejson": {
# "version": "2.1.6-1",
# "allowed": ">=",
# "removable": true
#},
"python-webob": {
# This version is behind by alot. We might need to repackage it.
# Grid dynamics repo lists 1.0.8-1.el6 (we might need to also)
"version": "0.9.6.1-3.el6",
"allowed": ">=",
"removable": true
},
# Requires EPEL repo
"python-xattr": {
# This version is behind by alot. We might need to repackage it.
"version": "0.5.0-1.el6",
"allowed": ">=",
"removable": true
},
"sqlite": {
# This version is a little bit behind
# That should be ok?
"version": "3.6.20-1.el6",
"allowed": ">=",
# Seems to attempt to remove yum, not good
"removable": false
},
"xfsprogs": {
"version": "3.1.1-4.el6",
"allowed": ">=",
"removable": true
}
} }
} }

4
conf/stack.ini
View File

@@ -248,8 +248,8 @@ ovs_bridge_external_name = br-int
# What user will apache be serving from # What user will apache be serving from
# #
# Root will typically not work (so this is here to fail) # Root will typically not work (so this is here to fail)
# sudo adduser <username> admin will be what you want to set this up. # sudo adduser <username> then sudo adduser <username> admin will be what you want to set this up.
# I typically use "sudo adduser horizon admin" # I typically use user "horizon"
apache_user = ${APACHE_USER:-horizon} apache_user = ${APACHE_USER:-horizon}
# This is the group of the previous user (adjust as needed) # This is the group of the previous user (adjust as needed)

9
devstack/cfg.py
View File

@@ -31,11 +31,12 @@ PW_TMPL = "Enter a password for %s: "
ENV_PAT = re.compile(r"^\s*\$\{([\w\d]+):\-(.*)\}\s*$") ENV_PAT = re.compile(r"^\s*\$\{([\w\d]+):\-(.*)\}\s*$")
SUB_MATCH = re.compile(r"(?:\$\(([\w\d]+):([\w\d]+))\)") SUB_MATCH = re.compile(r"(?:\$\(([\w\d]+):([\w\d]+))\)")
CACHE_MSG = "(value will now be internally cached)" CACHE_MSG = "(value will now be internally cached)"
DEF_PW_MSG = "[or press enter to get a generated one]"
PW_PROMPTS = { PW_PROMPTS = {
'horizon_keystone_admin': "Enter a password to use for horizon and keystone (20 chars or less): ", 'horizon_keystone_admin': "Enter a password to use for horizon and keystone (20 chars or less) %s: " % (DEF_PW_MSG),
'service_token': 'Enter a token to use for the service admin token: ', 'service_token': 'Enter a token to use for the service admin token %s: ' % (DEF_PW_MSG),
'sql': 'Enter a password to use for your sql database user: ', 'sql': 'Enter a password to use for your sql database user %s: ' % (DEF_PW_MSG),
'rabbit': 'Enter a password to use for your rabbit user: ', 'rabbit': 'Enter a password to use for your rabbit user %s: ' % (DEF_PW_MSG),
} }

9
devstack/components/keystone.py
View File

@@ -46,7 +46,7 @@ MANAGE_DATA_CONF = 'keystone_data.sh'
MANAGER_CMD_ROOT = [sh.joinpths("/", "bin", 'bash')] MANAGER_CMD_ROOT = [sh.joinpths("/", "bin", 'bash')]
#sync db command #sync db command
SYNC_DB_CMD = ['keystone-manage', 'sync_database'] SYNC_DB_CMD = [sh.joinpths('%BINDIR%', 'keystone-manage'), 'sync_database']
#what to start #what to start
APP_OPTIONS = { APP_OPTIONS = {
@@ -88,7 +88,12 @@ class KeystoneInstaller(comp.PythonInstallComponent):
def _sync_db(self): def _sync_db(self):
LOG.info("Syncing keystone to database named %s", DB_NAME) LOG.info("Syncing keystone to database named %s", DB_NAME)
sh.execute(*SYNC_DB_CMD, cwd=self.bindir) params = dict()
#it seems like this command only works if fully specified
#probably a bug
params['BINDIR'] = self.bindir
cmds = [{'cmd': SYNC_DB_CMD}]
utils.execute_template(*cmds, cwd=self.bindir, params=params)
def _get_config_files(self): def _get_config_files(self):
return list(CONFIGS) return list(CONFIGS)

34
devstack/progs/actions.py
View File

@@ -334,11 +334,33 @@ def _run_components(action_name, component_order, components, distro, root_dir,
return results return results
def _get_def_components():
#this seems to be the default list of what to install
#ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,
#n-crt,n-obj,n-cpu,n-net,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit}
def_components = dict()
#TODO glance subcomponents should be api/reg
def_components[settings.GLANCE] = []
def_components[settings.KEYSTONE] = []
#we seem to be missing the nova object store (n-obj)
#and nova network (n-net) and nova cert (n-crt)
#and nova scheduler (n-sch) and n-cauth (console auth)
#TODO talk to ken about these...
def_components[settings.NOVA] = [nova.NCPU, nova.NVOL, nova.NAPI]
def_components[settings.NOVNC] = []
#TODO n-xvnc?
def_components[settings.HORIZON] = []
def_components[settings.DB] = []
def_components[settings.RABBIT] = []
return def_components
def _run_action(args): def _run_action(args):
components = settings.parse_components(args.pop("components"), True) defaulted_components = False
components = settings.parse_components(args.pop("components"))
if not components: if not components:
cprint("No components specified!", "red") defaulted_components = True
return False components = _get_def_components()
action = _clean_action(args.pop("action")) action = _clean_action(args.pop("action"))
if not action: if not action:
cprint("No valid action specified!", "red") cprint("No valid action specified!", "red")
@@ -358,11 +380,15 @@ def _run_action(args):
print(header) print(header)
#need to figure out dependencies for components (if any) #need to figure out dependencies for components (if any)
ignore_deps = args.pop('ignore_deps', False) ignore_deps = args.pop('ignore_deps', False)
if not defaulted_components:
LOG.info("Activating components [%s]" % (", ".join(sorted(components.keys()))))
else:
LOG.info("Activating default components [%s]" % (", ".join(sorted(components.keys()))))
if not ignore_deps: if not ignore_deps:
new_components = settings.resolve_dependencies(components.keys()) new_components = settings.resolve_dependencies(components.keys())
component_diff = new_components.difference(components.keys()) component_diff = new_components.difference(components.keys())
if component_diff: if component_diff:
LOG.info("Having to activate dependent components: [%s]" % (", ".join(component_diff))) LOG.info("Having to activate dependent components: [%s]" % (", ".join(sorted(component_diff))))
for new_component in component_diff: for new_component in component_diff:
components[new_component] = list() components[new_component] = list()
component_skips = _check_roots(action, rootdir, components.keys()) component_skips = _check_roots(action, rootdir, components.keys())