← Back to branch summary

~soren/nova/iptables-security-groups

~soren/nova/iptables-security-groups

« back to all changes in this revision

Viewing changes to bin/nova-dhcpbridge

Committer: Soren Hansen
Date: 2011-01-03 09:56:21 UTC
mfrom: (430.2.79 nova)
Revision ID: soren@linux2go.dk-20110103095621-qy398qk1uk8o7cy3

Merge trunk

files added:
CA/genvpn.sh

bin/nova-combined

nova/api/openstack/common.py

nova/auth/openssh-lpk_openldap.schema

nova/auth/openssh-lpk_sun.schema

nova/fakememcache.py

nova/service.py

nova/tests/api/__init__.py

nova/tests/db

nova/tests/db/__init__.py

nova/tests/db/fakes.py

nova/tests/test_middleware.py

nova/tests/test_xenapi.py

nova/tests/xenapi

nova/tests/xenapi/__init__.py

nova/tests/xenapi/stubs.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/volume_utils.py

plugins/xenserver

plugins/xenserver/doc

plugins/xenserver/doc/networking.rst

plugins/xenserver/networking

plugins/xenserver/networking/etc

plugins/xenserver/networking/etc/init.d

plugins/xenserver/networking/etc/init.d/host-rules

plugins/xenserver/networking/etc/xensource

plugins/xenserver/networking/etc/xensource/scripts

plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch

plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/glance

run_tests.py

files removed:
nova/api/cloudpipe

nova/api/cloudpipe/__init__.py

nova/auth/openssh-lpk_openldap.schema

nova/auth/openssh-lpk_sun.schema

nova/process.py

nova/server.py

nova/service.py

nova/tests/api_integration.py

nova/tests/process_unittest.py

nova/tests/validator_unittest.py

nova/validate.py

nova/virt/libvirt.rescue.qemu.xml.template

nova/virt/libvirt.rescue.uml.xml.template

nova/virt/libvirt.rescue.xen.xml.template

nova/virt/libvirt.uml.xml.template

nova/virt/libvirt.xen.xml.template

run_tests.py

files renamed:
CA/INTER/ => CA/projects/

nova/cloudpipe/bootscript.sh => nova/cloudpipe/bootscript.template

nova/tests/api/__init__.py => nova/tests/api/test.py

nova/tests/access_unittest.py => nova/tests/test_access.py

nova/tests/api_unittest.py => nova/tests/test_api.py

nova/tests/auth_unittest.py => nova/tests/test_auth.py

nova/tests/cloud_unittest.py => nova/tests/test_cloud.py

nova/tests/compute_unittest.py => nova/tests/test_compute.py

nova/tests/flags_unittest.py => nova/tests/test_flags.py

nova/tests/misc_unittest.py => nova/tests/test_misc.py

nova/tests/network_unittest.py => nova/tests/test_network.py

nova/tests/quota_unittest.py => nova/tests/test_quota.py

nova/tests/rpc_unittest.py => nova/tests/test_rpc.py

nova/tests/scheduler_unittest.py => nova/tests/test_scheduler.py

nova/tests/service_unittest.py => nova/tests/test_service.py

nova/tests/twistd_unittest.py => nova/tests/test_twistd.py

nova/tests/virt_unittest.py => nova/tests/test_virt.py

nova/tests/volume_unittest.py => nova/tests/test_volume.py

nova/virt/libvirt.qemu.xml.template => nova/virt/libvirt.xml.template

plugins/xenapi/ => plugins/xenserver/xenapi/

files modified:
.bzrignore

.mailmap

Authors

CA/geninter.sh

CA/genrootca.sh

CA/openssl.cnf.tmpl

MANIFEST.in

bin/nova-api

bin/nova-compute

bin/nova-dhcpbridge

bin/nova-manage

bin/nova-network

bin/nova-scheduler

bin/nova-volume

contrib/nova.sh

contrib/puppet/files/production/nova-iptables

doc/ext/nova_autodoc.py

nova/adminclient.py

nova/api/__init__.py

nova/api/ec2/__init__.py

nova/api/ec2/admin.py

nova/api/ec2/apirequest.py

nova/api/ec2/cloud.py

nova/api/ec2/metadatarequesthandler.py

nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/backup_schedules.py

nova/api/openstack/flavors.py

nova/api/openstack/images.py

nova/api/openstack/ratelimiting/__init__.py

nova/api/openstack/servers.py

nova/api/openstack/sharedipgroups.py

nova/auth/dbdriver.py

nova/auth/fakeldap.py

nova/auth/ldapdriver.py

nova/auth/manager.py

nova/auth/nova_openldap.schema

nova/auth/nova_sun.schema

nova/auth/opendj.sh

nova/auth/slap.sh

nova/cloudpipe/pipelib.py

nova/compute/api.py

nova/compute/disk.py

nova/compute/instance_types.py

nova/compute/manager.py

nova/compute/monitor.py

nova/compute/power_state.py

nova/crypto.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/fakerabbit.py

nova/flags.py

nova/image/glance.py

nova/image/s3.py

nova/manager.py

nova/network/linux_net.py

nova/network/manager.py

nova/objectstore/handler.py

nova/objectstore/image.py

nova/rpc.py

nova/scheduler/chance.py

nova/scheduler/driver.py

nova/scheduler/manager.py

nova/scheduler/simple.py

nova/test.py

nova/tests/api/openstack/__init__.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_auth.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_servers.py

nova/tests/objectstore_unittest.py

nova/twistd.py

nova/utils.py

nova/virt/connection.py

nova/virt/fake.py

nova/virt/images.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/__init__.py

nova/virt/xenapi/network_utils.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi/volumeops.py

nova/virt/xenapi_conn.py

nova/volume/driver.py

nova/volume/manager.py

nova/wsgi.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore

run_tests.sh

setup.py

tools/clean-vlans

tools/pip-requires

tools/setup_iptables.sh

Show diffs side-by-side

added added

removed removed

bin/nova-dhcpbridge

110

110

FLAGS.num_networks = 5

111

111

path = os.path.abspath(os.path.join(os.path.dirname(__file__),

112

112

'..',

113

'_trial_temp',

114

113

'nova.sqlite'))

115

114

FLAGS.sql_connection = 'sqlite:///%s' % path

116

115

action = argv[1]

Older »