Merge "Update deprecated options for Mitaka release"

This commit is contained in:
Jenkins 2015-10-06 16:55:54 +00:00 committed by Gerrit Code Review
commit df2af1c72e

View File

@ -69,15 +69,15 @@
- name: "For agent, Log to screen" - name: "For agent, Log to screen"
lineinfile: lineinfile:
dest=/etc/ironic/ironic.conf dest=/etc/ironic/ironic.conf
insertafter="[agent]" insertafter="[pxe]"
regexp='^(.*)agent_pxe_append_params=(.*)$' regexp='^(.*)pxe_append_params=(.*)$'
line="agent_pxe_append_params=systemd.journald.forward_to_console=yes" line="pxe_append_params=systemd.journald.forward_to_console=yes"
- name: "For agent, place agent PXE template" - name: "For agent, place agent PXE template"
lineinfile: lineinfile:
dest=/etc/ironic/ironic.conf dest=/etc/ironic/ironic.conf
insertafter="[agent]" insertafter="[pxe]"
regexp='^(.*)agent_pxe_config_template=(.*)$' regexp='^(.*)pxe_config_template=(.*)$'
line="agent_pxe_config_template=/etc/ironic/agent_config.template" line="pxe_config_template=/etc/ironic/agent_config.template"
- name: "Configure conductor API url" - name: "Configure conductor API url"
lineinfile: lineinfile:
dest=/etc/ironic/ironic.conf dest=/etc/ironic/ironic.conf