From d4c84944e8f8870ff1c19cb719e31e02e576f9f8 Mon Sep 17 00:00:00 2001 From: Stephanie Miller Date: Fri, 14 Nov 2014 08:34:42 -0800 Subject: [PATCH] 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 --- README.rst | 3 --- plugins/inventory/group_vars/all | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 7574928..7c67770 100644 --- a/README.rst +++ b/README.rst @@ -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. diff --git a/plugins/inventory/group_vars/all b/plugins/inventory/group_vars/all index 32a9424..33067f1 100644 --- a/plugins/inventory/group_vars/all +++ b/plugins/inventory/group_vars/all @@ -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