Revision e083e94c
| b/snf-deploy/conf/packages.conf | ||
|---|---|---|
| 20 | 20 |
bridge-utils = |
| 21 | 21 |
python-progress = |
| 22 | 22 |
ganeti-instance-debootstrap = |
| 23 |
python-django-south = squeeze-backports |
|
| 23 | 24 |
|
| 24 | 25 |
|
| 25 | 26 |
[synnefo] |
| 26 |
snf-astakos-app = stable |
|
| 27 |
snf-common = stable |
|
| 28 |
snf-cyclades-app = stable |
|
| 29 |
snf-cyclades-gtools = stable |
|
| 30 |
snf-django-lib = stable |
|
| 31 |
python-astakosclient = stable |
|
| 32 |
python-objpool = stable |
|
| 33 |
snf-branding = stable |
|
| 34 |
snf-webproject = stable |
|
| 35 |
snf-pithos-app = stable |
|
| 36 |
snf-pithos-backend = stable |
|
| 37 |
snf-tools = stable |
|
| 38 |
python-django-south = squeeze-backports |
|
| 27 |
snf-astakos-app = squeeze |
|
| 28 |
snf-common = squeeze |
|
| 29 |
snf-cyclades-app = squeeze |
|
| 30 |
snf-cyclades-gtools = squeeze |
|
| 31 |
snf-django-lib = squeeze |
|
| 32 |
python-astakosclient = squeeze |
|
| 33 |
snf-branding = squeeze |
|
| 34 |
snf-webproject = squeeze |
|
| 35 |
snf-pithos-app = squeeze |
|
| 36 |
snf-pithos-backend = squeeze |
|
| 37 |
snf-tools = squeeze |
|
| 39 | 38 |
|
| 40 | 39 |
|
| 41 | 40 |
[ganeti] |
| ... | ... | |
| 43 | 42 |
ganeti-htools = 2.6.2+ippool11+hotplug5+extstorage3+rbdfix1+kvmfix2+nolvm+netxen-1~squeeze |
| 44 | 43 |
|
| 45 | 44 |
[other] |
| 46 |
snf-cloudcms = stable |
|
| 47 |
snf-vncauthproxy = stable |
|
| 48 |
snf-pithos-webclient = stable |
|
| 49 |
snf-image = stable |
|
| 50 |
snf-network = stable |
|
| 51 |
nfdhcpd = stable |
|
| 52 |
kamaki = stable |
|
| 53 |
python-bitarray = stable |
|
| 54 |
nfqueue-bindings-python = stable |
|
| 45 |
snf-cloudcms = squeeze |
|
| 46 |
snf-vncauthproxy = squeeze |
|
| 47 |
snf-pithos-webclient = squeeze |
|
| 48 |
snf-image = squeeze |
|
| 49 |
snf-network = squeeze |
|
| 50 |
python-objpool = squeeze |
|
| 51 |
nfdhcpd = squeeze |
|
| 52 |
kamaki = squeeze |
|
| 53 |
python-bitarray = squeeze-backports |
|
| 54 |
nfqueue-bindings-python = 0.3+physindev-1 |
|
| 55 | 55 |
|
| b/snf-deploy/conf/squeeze.conf | ||
|---|---|---|
| 1 |
[debian] |
|
| 2 |
rabbitmq-server = testing |
|
| 3 |
gunicorn = squeeze-backports |
|
| 4 |
qemu-kvm = squeeze-backports |
|
| 5 |
qemu = squeeze-backports |
|
| 6 |
python-gevent = squeeze-backports |
|
| 7 |
apache2 = |
|
| 8 |
postgresql = |
|
| 9 |
python-psycopg2 = |
|
| 10 |
python-argparse = |
|
| 11 |
nfs-kernel-server = squeeze-backports |
|
| 12 |
nfs-common = squeeze-backports |
|
| 13 |
bind9 = |
|
| 14 |
vlan = |
|
| 15 |
vlan = |
|
| 16 |
lvm2 = |
|
| 17 |
curl = |
|
| 18 |
memcached = |
|
| 19 |
python-memcache = |
|
| 20 |
bridge-utils = |
|
| 21 |
python-progress = |
|
| 22 |
ganeti-instance-debootstrap = |
|
| 23 |
python-django-south = squeeze-backports |
|
| 24 |
|
|
| 25 |
|
|
| 26 |
[synnefo] |
|
| 27 |
snf-astakos-app = squeeze |
|
| 28 |
snf-common = squeeze |
|
| 29 |
snf-cyclades-app = squeeze |
|
| 30 |
snf-cyclades-gtools = squeeze |
|
| 31 |
snf-django-lib = squeeze |
|
| 32 |
python-astakosclient = squeeze |
|
| 33 |
snf-branding = squeeze |
|
| 34 |
snf-webproject = squeeze |
|
| 35 |
snf-pithos-app = squeeze |
|
| 36 |
snf-pithos-backend = squeeze |
|
| 37 |
snf-tools = squeeze |
|
| 38 |
|
|
| 39 |
|
|
| 40 |
[ganeti] |
|
| 41 |
snf-ganeti = 2.6.2+ippool11+hotplug5+extstorage3+rbdfix1+kvmfix2+nolvm+netxen-1~squeeze |
|
| 42 |
ganeti-htools = 2.6.2+ippool11+hotplug5+extstorage3+rbdfix1+kvmfix2+nolvm+netxen-1~squeeze |
|
| 43 |
|
|
| 44 |
[other] |
|
| 45 |
snf-cloudcms = squeeze |
|
| 46 |
snf-vncauthproxy = squeeze |
|
| 47 |
snf-pithos-webclient = squeeze |
|
| 48 |
snf-image = squeeze |
|
| 49 |
snf-network = squeeze |
|
| 50 |
python-objpool = squeeze |
|
| 51 |
nfdhcpd = squeeze |
|
| 52 |
kamaki = squeeze |
|
| 53 |
python-bitarray = squeeze-backports |
|
| 54 |
nfqueue-bindings-python = 0.3+physindev-1 |
|
| 55 |
|
|
| b/snf-deploy/conf/wheezy.conf | ||
|---|---|---|
| 1 |
[debian] |
|
| 2 |
rabbitmq-server = testing |
|
| 3 |
gunicorn = |
|
| 4 |
qemu-kvm = |
|
| 5 |
qemu = |
|
| 6 |
python-gevent = |
|
| 7 |
apache2 = |
|
| 8 |
postgresql = |
|
| 9 |
python-psycopg2 = |
|
| 10 |
python-argparse = |
|
| 11 |
nfs-kernel-server = |
|
| 12 |
nfs-common = |
|
| 13 |
bind9 = |
|
| 14 |
vlan = |
|
| 15 |
vlan = |
|
| 16 |
lvm2 = |
|
| 17 |
curl = |
|
| 18 |
memcached = |
|
| 19 |
python-memcache = |
|
| 20 |
bridge-utils = |
|
| 21 |
python-progress = |
|
| 22 |
ganeti-instance-debootstrap = |
|
| 23 |
python-django-south = |
|
| 24 |
|
|
| 25 |
|
|
| 26 |
[synnefo] |
|
| 27 |
snf-astakos-app = wheezy |
|
| 28 |
snf-common = wheezy |
|
| 29 |
snf-cyclades-app = wheezy |
|
| 30 |
snf-cyclades-gtools = wheezy |
|
| 31 |
snf-django-lib = wheezy |
|
| 32 |
python-astakosclient = wheezy |
|
| 33 |
snf-branding = wheezy |
|
| 34 |
snf-webproject = wheezy |
|
| 35 |
snf-pithos-app = wheezy |
|
| 36 |
snf-pithos-backend = wheezy |
|
| 37 |
snf-tools = wheezy |
|
| 38 |
|
|
| 39 |
|
|
| 40 |
[ganeti] |
|
| 41 |
snf-ganeti = 2.6.2+ippool11+hotplug5+extstorage3+rbdfix1+kvmfix2+nolvm+netxen-1~wheezy |
|
| 42 |
ganeti-htools = 2.6.2+ippool11+hotplug5+extstorage3+rbdfix1+kvmfix2+nolvm+netxen-1~wheezy |
|
| 43 |
|
|
| 44 |
[other] |
|
| 45 |
snf-cloudcms = wheezy |
|
| 46 |
snf-vncauthproxy = wheezy |
|
| 47 |
snf-pithos-webclient = wheezy |
|
| 48 |
snf-image = wheezy |
|
| 49 |
snf-network = wheezy |
|
| 50 |
python-objpool = wheezy |
|
| 51 |
nfdhcpd = wheezy |
|
| 52 |
kamaki = wheezy |
|
| 53 |
python-bitarray = wheezy |
|
| 54 |
nfqueue-bindings-python = 0.3+physindev-1~wheezy |
|
| 55 |
|
|
| b/snf-deploy/fabfile.py | ||
|---|---|---|
| 77 | 77 |
APT_GET = "export DEBIAN_FRONTEND=noninteractive ;apt-get install -y --force-yes " |
| 78 | 78 |
|
| 79 | 79 |
host_info = env.env.ips_info[env.host] |
| 80 |
env.env.update_packages(host_info.os) |
|
| 80 | 81 |
if ast.literal_eval(env.env.use_local_packages): |
| 81 | 82 |
with settings(warn_only=True): |
| 82 | 83 |
deb = local("ls %s/%s*%s_all.deb" % (env.env.packages, package, host_info.os))
|
| 83 | 84 |
if deb: |
| 84 | 85 |
debug(env.host, " * Package %s found in %s..." % (package, env.env.packages)) |
| 85 | 86 |
put(deb, "/tmp/") |
| 86 |
try_run("dpkg -i /tmp/%s*deb || " % package + APT_GET + "-f")
|
|
| 87 |
try_run("rm /tmp/%s*deb" % package)
|
|
| 87 |
try_run("dpkg -i /tmp/%s || " % os.path.basename(deb) + APT_GET + "-f")
|
|
| 88 |
try_run("rm /tmp/%s" % os.path.basename(deb))
|
|
| 88 | 89 |
return |
| 89 | 90 |
|
| 90 | 91 |
info = getattr(env.env, package) |
| 91 |
if info in ["squeeze-backports", "stable", "testing", "unstable"]: |
|
| 92 |
if info == "squeeze-backports" and host_info.os == "wheezy": |
|
| 93 |
info = host_info.os |
|
| 92 |
if info in ["squeeze-backports", "stable", "testing", "unstable", "wheezy"]: |
|
| 94 | 93 |
APT_GET += " -t %s %s " % (info, package) |
| 95 | 94 |
elif info: |
| 96 | 95 |
APT_GET += " %s=%s " % (package, info) |
| b/snf-deploy/snfdeploy/lib.py | ||
|---|---|---|
| 83 | 83 |
|
| 84 | 84 |
class Env(object): |
| 85 | 85 |
|
| 86 |
def update_packages(self, os): |
|
| 87 |
for section in self.conf.files[os]: |
|
| 88 |
self.evaluate(os, section) |
|
| 89 |
|
|
| 86 | 90 |
def evaluate(self, filename, section): |
| 87 | 91 |
for k, v in self.conf.get_section(filename, section): |
| 88 | 92 |
setattr(self, k, v) |
| ... | ... | |
| 141 | 145 |
"vcluster": ["cluster", "image", "network"], |
| 142 | 146 |
"synnefo": ["cred", "synnefo", "roles"], |
| 143 | 147 |
"packages": ["debian", "ganeti", "synnefo", "other"], |
| 148 |
"squeeze": ["debian", "ganeti", "synnefo", "other"], |
|
| 149 |
"wheezy": ["debian", "ganeti", "synnefo", "other"], |
|
| 144 | 150 |
"ganeti": [], |
| 145 | 151 |
} |
| 146 | 152 |
|
| ... | ... | |
| 204 | 210 |
self.nodes.set("info", "public_iface", get_default_route()[1])
|
| 205 | 211 |
|
| 206 | 212 |
|
| 213 |
|
|
| 207 | 214 |
def debug(host, msg): |
| 208 | 215 |
|
| 209 | 216 |
print HEADER + host + \ |
Also available in: Unified diff