~lutostag/ubuntu/trusty/maas/1.5.4+keystone

« back to all changes in this revision

Viewing changes to src/provisioningserver/kernel_opts.py

Committer: Package Import Robot
Author(s): Andres Rodriguez
Date: 2013-03-04 11:49:44 UTC
mto: This revision was merged to the branch mainline in revision 25.
Revision ID: package-import@ubuntu.com-20130304114944-azcvu9anlf8mizpa

Tags: upstream-1.3+bzr1452+dfsg

Import upstream version 1.3+bzr1452+dfsg

files added:
docs/media/cluster-config.png

docs/tags.rst

src/maasserver/api_support.py

src/maasserver/api_utils.py

src/maasserver/static/css/components/slider.css

src/maasserver/static/js/reveal.js

src/maasserver/static/js/tests/test_reveal.html

src/maasserver/static/js/tests/test_reveal.js

src/maasserver/templates/maasserver/settings_add_commissioning_script.html

src/maasserver/templates/maasserver/settings_commissioning_scripts.html

src/maasserver/templates/maasserver/settings_confirm_delete_commissioning_script.html

src/maasserver/testing/db_migrations.py

src/maasserver/testing/tests/test_db_migrations.py

src/maasserver/tests/test_api_utils.py

src/maasserver/tests/test_migrations.py

src/maasserver/tests/test_views_settings_commissioning_scripts.py

src/maasserver/views/settings_commissioning_scripts.py

src/metadataserver/commissioning

src/metadataserver/commissioning/__init__.py

src/metadataserver/commissioning/snippets

src/metadataserver/commissioning/snippets/__init__.py

src/metadataserver/commissioning/snippets/maas_api_helper.py

src/metadataserver/commissioning/snippets/maas_get.py

src/metadataserver/commissioning/snippets/maas_signal.py

src/metadataserver/commissioning/tests

src/metadataserver/commissioning/tests/__init__.py

src/metadataserver/commissioning/tests/test_user_data.py

src/metadataserver/commissioning/user_data.py

src/metadataserver/commissioning/user_data.template

src/metadataserver/commissioning/user_data_config.template

src/metadataserver/enum.py

src/metadataserver/migrations/0004_add_commissioningscript.py

src/metadataserver/migrations/0005_nodecommissionresult_add_timestamp.py

src/metadataserver/migrations/0006_nodecommissionresult_add_status.py

src/metadataserver/migrations/0007_nodecommissionresult_change_name_size.py

src/metadataserver/migrations/0008_rename_lshw_commissioning_output.py

src/metadataserver/migrations/0009_delete_status.py

src/metadataserver/migrations/0010_add_script_result.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/tests/test_commissioningscript.py

src/metadataserver/tests/test_migrations.py

utilities/find-imported-module-files

files removed:
etc/cron.d

etc/cron.d/maas-gc

etc/cron.d/maas-import-pxe-files

etc/maas/commissioning-user-data

scripts/maas-import-isos

src/maasserver/dj14

src/maasserver/dj14/__init__.py

src/maasserver/dj14/forms.py

src/maasserver/dj14/genericipaddressfield.py

src/maasserver/dj14/ipv6.py

src/maasserver/dj14/validators.py

files modified:
HACKING.txt

INSTALL.txt

MANIFEST.in

Makefile

acceptance/with-make

contrib/preseeds_v2/enlist_userdata

contrib/preseeds_v2/generic

docs/conf.py

docs/configure.rst

docs/maascli.rst

docs/man/maas-cli.8.rst

docs/man/maas.8.rst

etc/maas/import_ephemerals

etc/maas/import_pxe_files

required-packages/base

required-packages/dev

scripts/maas-import-ephemerals

scripts/maas-import-pxe-files

setup.py

src/apiclient/maas_client.py

src/apiclient/tests/test_maas_client.py

src/maas/development.py

src/maas/settings.py

src/maascli/tests/test_integration.py

src/maasserver/api.py

src/maasserver/apidoc.py

src/maasserver/context_processors.py

src/maasserver/forms.py

src/maasserver/models/__init__.py

src/maasserver/models/config.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/tag.py

src/maasserver/power_parameters.py

src/maasserver/preseed.py

src/maasserver/static/css/components/blocks.css

src/maasserver/static/css/components/table_list.css

src/maasserver/static/css/modifiers.css

src/maasserver/static/js/tests/test_enums.html

src/maasserver/static/js/tests/test_longpoll.html

src/maasserver/static/js/tests/test_morph.html

src/maasserver/static/js/tests/test_node.html

src/maasserver/static/js/tests/test_node_add.html

src/maasserver/static/js/tests/test_node_views.html

src/maasserver/static/js/tests/test_nodes_chart.html

src/maasserver/static/js/tests/test_power_parameters.html

src/maasserver/static/js/tests/test_prefs.html

src/maasserver/static/js/tests/test_user_panel.html

src/maasserver/static/js/tests/test_utils.html

src/maasserver/templates/maasserver/form_field.html

src/maasserver/templates/maasserver/node_view.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/settings_cluster_listing.html

src/maasserver/templates/maasserver/settings_cluster_listing_row.html

src/maasserver/templates/maasserver/tag_view.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_apidoc.py

src/maasserver/tests/test_filestorage.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_node.py

src/maasserver/tests/test_nodegroup.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_tag.py

src/maasserver/tests/test_views_account.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/tests/test_views_settings.py

src/maasserver/tests/test_views_tags.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/views/account.py

src/maasserver/views/nodes.py

src/maasserver/views/settings.py

src/maastesting/__init__.py

src/maastesting/bindfixture.py

src/maastesting/fixtures.py

src/maastesting/httpd.py

src/maastesting/tests/test_fixtures.py

src/maastesting/tests/test_httpd.py

src/metadataserver/api.py

src/metadataserver/models/__init__.py

src/metadataserver/models/nodecommissionresult.py

src/metadataserver/tests/test_api.py

src/metadataserver/tests/test_nodecommissionresult.py

src/metadataserver/urls.py

src/provisioningserver/dhcp/tests/test_writer.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/pxe/config.local.x86.template

src/provisioningserver/tags.py

src/provisioningserver/tasks.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_customize_config.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_maas_import_pxe_files.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/tests/test_utils.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/provisioningserver/kernel_opts.py

"preseed_url", # URL from which a preseed can be obtained.

"log_host", # Host/IP to which syslog can be streamed.

"fs_host", # Host/IP on which ephemeral filesystems are hosted.

"extra_opts", # String of extra options to supply, will be appended

# verbatim to the kernel command line

))

177

179

# as it would be nice to have.

178

180

options += compose_logging_opts(params.log_host)

179

181

options += compose_arch_opts(params)

182

if params.extra_opts:

183

options.append(params.extra_opts)

180

184

return ' '.join(options)

Older »