Add options to group_vars to make it match docs

In the README, we state that options will be available in the
plugins/group_vars/all file for the user to uncomment. We missed
adding a few of those options to the file, so I've added them.
I also removed a section of outdated documentation that snuck
back in during a merge.

Change-Id: Ib5b19ebc02477a00765bc625612c7f9ae8ed0de3
This commit is contained in:
Stephanie Miller 2014-11-14 08:34:42 -08:00 committed by Julia Kreger
parent 5abf336742
commit d4c84944e8
2 changed files with 6 additions and 3 deletions

View File

@ -190,9 +190,6 @@ file.
before starting any jobs.
* post_hook_command - Similar to the pre_hook_command variable, when
defined, will execute upon the completion of the upgrade job.
* previous_upgrade_failed_restart_mysql - This option enables logic to restart
MySQL in the event it is not running on the controllerMgmt node, likely from
a failed upgrade.
* online_upgrade - This setting tells the script to attempt an online upgrade
of the node. At present this is only known to work on compute nodes.

View File

@ -22,6 +22,12 @@ wait_for_hostkey: True
# This option adjusts logic to enable single controllers to be upgraded
# instead of the entire controller cluster.
ssh_timeout: 900
# Command to be run on the playbook-executing host prior to upgrade
# pre_hook_command: /bin/date
# Command to be run on the playbook-executing host after upgrade
# post_hook_command: /bin/date
# Attempt online upgrade of compute nodes
# online_upgrade: True
default_update_file_location: /tmp/update_image.qcow2
overcloud_controller_services:
- haproxy