openstack/bifrost
Code Issues Proposed changes

Cleaning up README and ironic config template

Browse Source
This commit is contained in:
Julia Kreger 2015-02-25 08:22:08 -05:00
parent ceeeb7de47
commit cf19344580
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.rst
View File

@ -5,8 +5,7 @@ Deets on the etherpad for now:
Step 1: Step 1:
cd step1 cd step1
bash ./env-setup.sh bash ./env-setup.sh
source /opt/stack/ansible/hacking/env-setup source /opt/stack/ansible/hacking/env-setup
ansible-playbook -vvvv -i localhost ./install.yaml ansible-playbook -vvvv -i localhost ./install.yaml

14
step1/templates/ironic.conf.j2
View File

@ -215,8 +215,11 @@ auth_strategy=noauth
# present on your system may be found by enumerating the # present on your system may be found by enumerating the
# "ironic.drivers" entrypoint. An example may be found in the # "ironic.drivers" entrypoint. An example may be found in the
# developer documentation online. (list value) # developer documentation online. (list value)
enabled_drivers=pxe_ipmitool {% if testing %}
enabled_drivers=pxe_ssh,pxe_ipmitool
{% else %]
enabled_drivers=pxe_ilo
{% endif %}
# #
# Options defined in ironic.common.exception # Options defined in ironic.common.exception
@ -1284,7 +1287,7 @@ http_root=/httpboot
ipxe_enabled=true ipxe_enabled=true
# The path to the main iPXE script file. (string value) # The path to the main iPXE script file. (string value)
ipxe_boot_script=$pybasedir/drivers/modules/boot.ipxe ipxe_boot_script=$pybasedir/drivers/modules/ipxe_config.template
[seamicro] [seamicro]
@ -1319,8 +1322,9 @@ ipxe_boot_script=$pybasedir/drivers/modules/boot.ipxe
# #
# libvirt uri (string value) # libvirt uri (string value)
#libvirt_uri=qemu:///system {% if testing %}
libvirt_uri=qemu:///system
{% endif %}
[swift] [swift]