← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to maas/maasnet2.xml

Committer: Aaron Bentley
Date: 2014-02-28 16:40:22 UTC
mto: This revision was merged to the branch mainline in revision 257.
Revision ID: aaron.bentley@canonical.com-20140228164022-kfip2tphn9m9invi

Add juju-backup script.

files added:
assemble-public-tools.bash

azure

azure-sdk-for-python-master

azure-sdk-for-python-master/ChangeLog.txt

azure-sdk-for-python-master/LICENSE.txt

azure-sdk-for-python-master/README.md

azure-sdk-for-python-master/azure

azure-sdk-for-python-master/azure.sln

azure-sdk-for-python-master/azure/__init__.py

azure-sdk-for-python-master/azure/azure.pyproj

azure-sdk-for-python-master/azure/http

azure-sdk-for-python-master/azure/http/__init__.py

azure-sdk-for-python-master/azure/http/batchclient.py

azure-sdk-for-python-master/azure/http/httpclient.py

azure-sdk-for-python-master/azure/http/winhttp.py

azure-sdk-for-python-master/azure/servicebus

azure-sdk-for-python-master/azure/servicebus/__init__.py

azure-sdk-for-python-master/azure/servicebus/servicebusservice.py

azure-sdk-for-python-master/azure/servicemanagement

azure-sdk-for-python-master/azure/servicemanagement/__init__.py

azure-sdk-for-python-master/azure/servicemanagement/servicebusmanagementservice.py

azure-sdk-for-python-master/azure/servicemanagement/servicemanagementclient.py

azure-sdk-for-python-master/azure/servicemanagement/servicemanagementservice.py

azure-sdk-for-python-master/azure/storage

azure-sdk-for-python-master/azure/storage/__init__.py

azure-sdk-for-python-master/azure/storage/blobservice.py

azure-sdk-for-python-master/azure/storage/cloudstorageaccount.py

azure-sdk-for-python-master/azure/storage/queueservice.py

azure-sdk-for-python-master/azure/storage/sharedaccesssignature.py

azure-sdk-for-python-master/azure/storage/storageclient.py

azure-sdk-for-python-master/azure/storage/tableservice.py

azure-sdk-for-python-master/setup.py

azure_publish_tools.py

backport-source-packages.bash

build-win-installer

common-startup.sh

cpc-mirrors.json.template

deploy-job

get-tarfile-name

inc-brew-juju.bash

jenkins-job

juju-backup

lp-copy-packages

make-package-with-tarball.bash

make-recipe-and-package.bash

make-release-tarball.bash

manual-deploy

manual-deploy-job

mirrors.json.template

prepare-new-version

publish-public-tools.bash

publish-revision

swift-sync.bash

test-new-version

test_deploy

upgrade-job

upgrade-juju

winbuildtest.py

files removed:
Makefile

add-missing-result-yaml-files.py

add-remote-machine.bash

assemble-parallel-streams.bash

assess_bootstrap.py

assess_container_networking.py

assess_cs_staging.py

assess_heterogeneous_control.py

assess_jes_deploy.py

assess_log_rotation.py

assess_min_version.py

assess_mixed_images.py

assess_recovery.py

assess_spaces_subnets.py

assess_status_output.py

assess_update_mongo.py

backup-to-s3.py

bootstrap

build-osx-client-remote.bash

build-osx-client.bash

build_juju.py

build_vagrant_boxes.py

candidate.py

chaos.py

check_blockers.py

clean_resources.py

delete-old-s3-control-buckets.bash

deploy_job.py

download_juju.py

dump_logs.py

get_ami.py

git-recent.bash

git_gate.py

gotesttarfile.py

gotestwin.py

industrial_test.py

inject-metadata

jenkins_build_package.py

joyent.py

juju-ci-openstack-check.sh

juju-ci-tools-common

jujuci.py

maas

maas/add-virtual-maas-nodes.bash

maas/maas-node-1.xml

maas/maas-node-first-NIC-1.xml

maas/maasnet2.xml

maas/maaspool1.xml

maas/maasprv1.xml

maas/setup-virtual-maas.bash

make-buildvars

make-parallel-streams.bash

manage-build-revision.bash

openstack_basic_check.py

parallel-streams-job.bash

per-test-streams.bash

pipdeps.py

quickstart_deploy.py

rackspace-generate-image-streams.bash

remote.py

remove-lxc-juju.bash

remove-manual-juju.bash

requirements.txt

retrieve-ubuntu-packages.bash

run-client-server-test-remote.bash

run-client-server-test.bash

run-deploy-job-remote.bash

run-deploy-job.bash

run-juju-eco-unit-tests.bash

run-osx-client-remote.bash

run-osx-client.bash

run-reliability-test.bash

run-win-client-server-remote.bash

run_chaos_monkey.py

run_deploy_job_wr.py

run_deployer.py

run_download_juju.py

s3ci.py

scale_out.py

schedule_chaos_tests.py

schedule_hetero_control.py

schedule_reliability_tests.py

setup-slave.bash

start_libvirt_domain.py

status.py

stop_libvirt_domain.py

substrate.py

template_assess.py.tmpl

template_test.py.tmpl

test-restricted-network

tests

tests/__init__.py

tests/test_assess_bootstrap.py

tests/test_assess_container_networking.py

tests/test_assess_cs_staging.py

tests/test_assess_heterogeneous_control.py

tests/test_assess_jes_deploy.py

tests/test_assess_log_rotation.py

tests/test_assess_min_version.py

tests/test_assess_mixed_images.py

tests/test_assess_recovery.py

tests/test_assess_spaces_subnets.py

tests/test_assess_status_output.py

tests/test_assess_update_mongo.py

tests/test_build_juju.py

tests/test_candidate.py

tests/test_chaos.py

tests/test_check_blockers.py

tests/test_clean_resources.py

tests/test_deploy_stack.py

tests/test_download_juju.py

tests/test_get_ami.py

tests/test_git_gate.py

tests/test_gotesttarfile.py

tests/test_industrial_test.py

tests/test_joyent.py

tests/test_jujuci.py

tests/test_jujuconfig.py

tests/test_openstack_basic_check.py

tests/test_pipdeps.py

tests/test_quickstart_deploy.py

tests/test_remote.py

tests/test_run_chaos_monkey.py

tests/test_run_deployer.py

tests/test_run_download_juju.py

tests/test_s3ci.py

tests/test_scale_out.py

tests/test_schedule_chaos_tests.py

tests/test_schedule_hetero_control.py

tests/test_schedule_reliability_tests.py

tests/test_substrate.py

tests/test_timeout.py

tests/test_update_lxc_cache.py

tests/test_upload_jenkins_job.py

tests/test_utility.py

tests/test_verify_landscape_bundle.py

tests/test_verify_mediawiki_bundle.py

tests/test_winazure.py

tests/test_write_industrial_test_metadata.py

timeout.py

update-jenkins-branches.bash

update-juju-eco-tree.bash

update_lxc_cache.py

upload_jenkins_job.py

utility.py

verify_landscape_bundle.py

verify_mediawiki_bundle.py

winazure.py

write_industrial_test_metadata.py

files renamed:
assess_win_client.py => test-win-client

tests/test_jujupy.py => test_jujupy.py

files modified:
.bzrignore

README.md

cloud_deploy.py

deploy_stack.py *

destroy-environment

ec2-run-instance-get-id

ec2-terminate-job-instances

jujuconfig.py

jujupy.py

run-unit-tests

wait_for_agent_update.py

Show diffs side-by-side

added added

removed removed

maas/maasnet2.xml

1

<network>

2

<name>maasnet2</name>

3

<forward mode='nat'>

4

<nat>

5

<port start='1024' end='65535'/>

6

</nat>

7

</forward>

8

<bridge name='maasnetbr2' stp='on' delay='0'/>

9

<ip address='10.0.200.1' netmask='255.255.255.0'>

10

</ip>

11

</network>

Older »