diff options
| author | Robert Collins <rbtcollins@hp.com> | 2014-06-05 20:00:53 +1200 |
|---|---|---|
| committer | Chris Krelle <nobodycam@gmail.com> | 2014-08-19 11:35:11 -0700 |
| commit | 04f1a054a06c4bf59bae970d973c17b13ab6182d (patch) | |
| tree | d89d91198afab510e7d50acb2bfbe6dc84a81799 /ironic/drivers/modules/agent_config.template | |
| parent | edc9bb038addfc27ffe75ecb81a568c6ebb876c2 (diff) | |
| download | ironic-04f1a054a06c4bf59bae970d973c17b13ab6182d.tar.gz | |
Add in text for text mode on trusty
This should be fine for other distros and Ubuntu versions since
the kernel command line is a well known loosely-coupled interface.
Trusty changed the way to get text mode consoles (again) and since
we're deploying servers, where graphics is an anti-feature, lets
work around it by default, again.
Also update test_pxe.test__build_pxe_config to work with the new
kernel option.
updates Ipxe and IPA deploy templates too.
Change-Id: Id42bd362477b1e8dbbd5f2a6188cebacc8a0323a
Diffstat (limited to 'ironic/drivers/modules/agent_config.template')
| -rw-r--r-- | ironic/drivers/modules/agent_config.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/drivers/modules/agent_config.template b/ironic/drivers/modules/agent_config.template index 020d7e6c1..3f36d4e69 100644 --- a/ironic/drivers/modules/agent_config.template +++ b/ironic/drivers/modules/agent_config.template @@ -2,4 +2,4 @@ default deploy label deploy kernel {{ pxe_options.deployment_aki_path }} -append initrd={{ pxe_options.deployment_ari_path }} {{ pxe_options.pxe_append_params }} {% if pxe_options.ipa_api_url %}ipa-api-url={{ pxe_options.ipa_api_url }}{% endif %} {% if pxe_options.ipa_advertise_host %}ipa-advertise-host={{ pxe_options.ipa_advertise_host }}{% endif %} +append initrd={{ pxe_options.deployment_ari_path }} text {{ pxe_options.pxe_append_params }} {% if pxe_options.ipa_api_url %}ipa-api-url={{ pxe_options.ipa_api_url }}{% endif %} {% if pxe_options.ipa_advertise_host %}ipa-advertise-host={{ pxe_options.ipa_advertise_host }}{% endif %} |