← Back to branch summary

~allenap/maas/xxx-a-thon

~allenap/maas/xxx-a-thon

« back to all changes in this revision

Viewing changes to services/dns/run

Committer: LaMont Jones
Date: 2016-03-07 23:20:52 UTC
mfrom: (4657.1.84 maas)
mto: (4657.1.93 maas)
mto: This revision was merged to the branch mainline in revision 4660.
Revision ID: lamont@canonical.com-20160307232052-rgfxbq7dujj6s093

Merge from trunk.

files added:
src/maasserver/data

src/maasserver/data/__init__.py

src/maasserver/forms_filesystem.py

src/maasserver/management/commands/template.py

src/maasserver/migrations/builtin/maasserver/0038_filesystem_ramfs_tmpfs_support.py

src/maasserver/migrations/builtin/maasserver/0039_create_template_and_versionedtextfile_models.py

src/maasserver/models/template.py

src/maasserver/models/tests/test_template.py

src/maasserver/models/tests/test_versionedtextfile.py

src/maasserver/models/versionedtextfile.py

src/maasserver/tests/test_commands_template.py

src/maasserver/tests/test_forms_node.py

src/provisioningserver/utils/iproute.py

src/provisioningserver/utils/tests/test_iproute.py

utilities/check-imports

utilities/create-python-templates

files removed:
src/maasfascist.py

src/provisioningserver/drivers/hardware/apc.py

src/provisioningserver/drivers/hardware/hmc.py

src/provisioningserver/drivers/hardware/msftocs.py

src/provisioningserver/drivers/hardware/tests/test_apc.py

src/provisioningserver/drivers/hardware/tests/test_hmc.py

src/provisioningserver/drivers/hardware/tests/test_msftocs.py

files renamed:
docs/man/maas-region-admin.8.rst => docs/man/maas-region.8.rst

man/maas-region-admin.8 => man/maas-region.8

src/maasserver/tests/test_forms_node.py => src/maasserver/tests/test_forms_machine.py

src/maasserver/tests/test_forms_nodewithmacaddresses.py => src/maasserver/tests/test_forms_machinewithmacaddresses.py

files modified:
.bzrignore

HACKING.txt

INSTALL.txt

Makefile

buildout.cfg

docs/conf.py

docs/configure.rst

docs/development/cluster-registration.rst

docs/index.rst

docs/maascli.rst

etc/maas/templates/dhcp/dhcpd.conf.template

etc/maas/templates/dhcp/dhcpd6.conf.template

services/dns/run

services/rackd/run

src/apiclient/__init__.py

src/maas/__init__.py

src/maas/demo.py

src/maas/settings.py

src/maascli/__init__.py

src/maasserver/__init__.py

src/maasserver/api/account.py

src/maasserver/api/auth.py

src/maasserver/api/bcache.py

src/maasserver/api/bcache_cacheset.py

src/maasserver/api/blockdevices.py

src/maasserver/api/boot_resources.py

src/maasserver/api/boot_source_selections.py

src/maasserver/api/boot_sources.py

src/maasserver/api/commissioning_scripts.py

src/maasserver/api/devices.py

src/maasserver/api/dnsresourcerecords.py

src/maasserver/api/dnsresources.py

src/maasserver/api/doc.py

src/maasserver/api/doc_handler.py

src/maasserver/api/domains.py

src/maasserver/api/events.py

src/maasserver/api/fabrics.py

src/maasserver/api/fannetworks.py

src/maasserver/api/files.py

src/maasserver/api/interfaces.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/license_keys.py

src/maasserver/api/logger.py

src/maasserver/api/maas.py

src/maasserver/api/machines.py

src/maasserver/api/networks.py

src/maasserver/api/nodes.py

src/maasserver/api/not_found.py

src/maasserver/api/partitions.py

src/maasserver/api/pxeconfig.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/raid.py

src/maasserver/api/spaces.py

src/maasserver/api/ssh_keys.py

src/maasserver/api/ssl_keys.py

src/maasserver/api/subnets.py

src/maasserver/api/support.py

src/maasserver/api/tags.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_partitions.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/users.py

src/maasserver/api/utils.py

src/maasserver/api/version.py

src/maasserver/api/volume_groups.py

src/maasserver/api/zones.py

src/maasserver/dhcp.py

src/maasserver/dns/zonegenerator.py

src/maasserver/enum.py

src/maasserver/exceptions.py

src/maasserver/forms.py

src/maasserver/forms_interface.py

src/maasserver/migrations/builtin/maasserver/0004_migrate_installable_to_node_type.py

src/maasserver/models/__init__.py

src/maasserver/models/bmc.py

src/maasserver/models/filesystem.py

src/maasserver/models/interface.py

src/maasserver/models/node.py

src/maasserver/models/signals/interfaces.py

src/maasserver/models/signals/nodes.py

src/maasserver/models/signals/tests/test_interfaces.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_bmc.py

src/maasserver/models/tests/test_filesystem.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_node.py

src/maasserver/preseed.py

src/maasserver/preseed_storage.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/server_address.py

src/maasserver/static/js/angular/controllers/add_device.js

src/maasserver/static/js/angular/controllers/add_hardware.js

src/maasserver/static/js/angular/controllers/domain_details.js

src/maasserver/static/js/angular/controllers/domains_list.js

src/maasserver/static/js/angular/controllers/node_details.js

src/maasserver/static/js/angular/controllers/node_details_networking.js

src/maasserver/static/js/angular/controllers/tests/test_add_device.js

src/maasserver/static/js/angular/controllers/tests/test_add_hardware.js

src/maasserver/static/js/angular/controllers/tests/test_domain_details.js

src/maasserver/static/js/angular/controllers/tests/test_domains_list.js

src/maasserver/static/js/angular/controllers/tests/test_node_details.js

src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js

src/maasserver/static/js/angular/controllers/tests/test_vlan_details.js

src/maasserver/static/js/angular/controllers/vlan_details.js

src/maasserver/static/js/angular/factories/controllers.js

src/maasserver/static/js/angular/factories/domains.js

src/maasserver/static/js/angular/factories/tests/test_domains.js

src/maasserver/static/js/angular/factories/vlans.js

src/maasserver/static/partials/domain-details.html

src/maasserver/static/partials/domains-list.html

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/partials/vlan-details.html

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/index.html

src/maasserver/testing/factory.py

src/maasserver/testing/sampledata.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_forms_blockdevice.py

src/maasserver/tests/test_forms_device.py

src/maasserver/tests/test_forms_filesystem.py

src/maasserver/tests/test_forms_helpers.py

src/maasserver/tests/test_forms_interface.py

src/maasserver/tests/test_forms_partition.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/triggers/tests/test_websocket.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/utils/__init__.py

src/maasserver/utils/storage.py

src/maasserver/websockets/handlers/controller.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/domain.py

src/maasserver/websockets/handlers/machine.py

src/maasserver/websockets/handlers/tests/test_controller.py

src/maasserver/websockets/handlers/tests/test_domain.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/maasserver/websockets/handlers/tests/test_vlan.py

src/maasserver/websockets/handlers/vlan.py

src/maasserver/websockets/tests/test_base.py

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/__init__.py

src/maastesting/tests/test_dbupgrade.py

src/metadataserver/__init__.py

src/provisioningserver/__init__.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/testing/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_notifier.py

src/provisioningserver/drivers/hardware/seamicro.py

src/provisioningserver/drivers/hardware/tests/test_seamicro.py

src/provisioningserver/drivers/hardware/tests/test_ucsm.py

src/provisioningserver/drivers/hardware/tests/test_virsh.py

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/hardware/virsh.py

src/provisioningserver/drivers/hardware/vmware.py

src/provisioningserver/drivers/power/apc.py

src/provisioningserver/drivers/power/hmc.py

src/provisioningserver/drivers/power/mscm.py

src/provisioningserver/drivers/power/msftocs.py

src/provisioningserver/drivers/power/tests/test_apc.py

src/provisioningserver/drivers/power/tests/test_hmc.py

src/provisioningserver/drivers/power/tests/test_mscm.py

src/provisioningserver/drivers/power/tests/test_msftocs.py

src/provisioningserver/drivers/power/tests/test_vmware.py

src/provisioningserver/drivers/power/vmware.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/dhcp.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/rpc/tests/test_utils.py

src/provisioningserver/rpc/utils.py

src/provisioningserver/utils/fs.py

src/provisioningserver/utils/ipaddr.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/ps.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_ipaddr.py

src/provisioningserver/utils/tests/test_network.py

src/provisioningserver/utils/tests/test_ps.py

src/provisioningserver/utils/tests/test_script.py

utilities/remote-reinstall

Show diffs side-by-side

added added

removed removed

services/dns/run

34

34

35

35

# Create MAAS' DNS config: do not overwrite an existing config file

36

36

# as the writing of the full configuration might have happened already.

37

bin/maas-region-admin set_up_dns --no-clobber

37

bin/maas-region set_up_dns --no-clobber

38

38

39

39

# Edit the fixture's named.conf to include MAAS' DNS config.

40

bin/maas-region-admin get_named_conf \

40

bin/maas-region get_named_conf \

41

41

--edit --config_path "${homedir}/named.conf"

42

42

43

43

# Run named.

Older »