From 2c91510d4ce3baa92e8e054223659e4e3fa5dbcd Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Tue, 17 Jan 2017 14:55:46 -0400 Subject: Implement pre/post master upgrade hooks. --- inventory/byo/hosts.origin.example | 15 +++++++++++++++ inventory/byo/hosts.ose.example | 15 +++++++++++++++ 2 files changed, 30 insertions(+) (limited to 'inventory') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index dde172c4a..062a776b0 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -89,6 +89,21 @@ openshift_release=v1.4 # Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone. # docker_upgrade=False + +# Upgrade Hooks +# +# Hooks are available to run custom tasks at various points during a cluster +# upgrade. Each hook should point to a file with Ansible tasks defined. Suggest using +# absolute paths, if not the path will be treated as relative to the file where the +# hook is actually used. +# +# Tasks to run before each master is upgraded: +# openshift_upgrade_pre_master_hook=/usr/share/custom/pre_master.yml +# +# Tasks to run after each master is upgraded: +# openshift_upgrade_post_master_hook=/usr/share/custom/post_master.yml + + # Alternate image format string, useful if you've got your own registry mirror #oreg_url=example.com/openshift3/ose-${component}:${version} # If oreg_url points to a registry other than registry.access.redhat.com we can diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index c0dd8a1e8..bcc2373ce 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -89,6 +89,21 @@ openshift_release=v3.4 # Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone. # docker_upgrade=False + +# Upgrade Hooks +# +# Hooks are available to run custom tasks at various points during a cluster +# upgrade. Each hook should point to a file with Ansible tasks defined. Suggest using +# absolute paths, if not the path will be treated as relative to the file where the +# hook is actually used. +# +# Tasks to run before each master is upgraded: +# openshift_upgrade_pre_master_hook=/usr/share/custom/pre_master.yml +# +# Tasks to run after each master is upgraded: +# openshift_upgrade_post_master_hook=/usr/share/custom/post_master.yml + + # Alternate image format string, useful if you've got your own registry mirror #oreg_url=example.com/openshift3/ose-${component}:${version} # If oreg_url points to a registry other than registry.access.redhat.com we can -- cgit v1.2.3 From 50ce715a704f77190a278bed2326cc567855181d Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Fri, 20 Jan 2017 16:05:24 -0400 Subject: Add a mid upgrade hook, re-prefix variables. --- inventory/byo/hosts.origin.example | 12 ++++++++---- inventory/byo/hosts.ose.example | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'inventory') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 062a776b0..0a1b8c5c4 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -97,11 +97,15 @@ openshift_release=v1.4 # absolute paths, if not the path will be treated as relative to the file where the # hook is actually used. # -# Tasks to run before each master is upgraded: -# openshift_upgrade_pre_master_hook=/usr/share/custom/pre_master.yml +# Tasks to run before each master is upgraded. +# openshift_master_upgrade_pre_hook=/usr/share/custom/pre_master.yml # -# Tasks to run after each master is upgraded: -# openshift_upgrade_post_master_hook=/usr/share/custom/post_master.yml +# Tasks to run to upgrade the master. These tasks run after the main openshift-ansible +# upgrade steps, but before we restart system/services. +# openshift_master_upgrade_hook=/usr/share/custom/master.yml +# +# Tasks to run after each master is upgraded and system/services have been restarted. +# openshift_master_upgrade_post_hook=/usr/share/custom/post_master.yml # Alternate image format string, useful if you've got your own registry mirror diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index bcc2373ce..89b9d7e48 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -97,11 +97,15 @@ openshift_release=v3.4 # absolute paths, if not the path will be treated as relative to the file where the # hook is actually used. # -# Tasks to run before each master is upgraded: -# openshift_upgrade_pre_master_hook=/usr/share/custom/pre_master.yml +# Tasks to run before each master is upgraded. +# openshift_master_upgrade_pre_hook=/usr/share/custom/pre_master.yml # -# Tasks to run after each master is upgraded: -# openshift_upgrade_post_master_hook=/usr/share/custom/post_master.yml +# Tasks to run to upgrade the master. These tasks run after the main openshift-ansible +# upgrade steps, but before we restart system/services. +# openshift_master_upgrade_hook=/usr/share/custom/master.yml +# +# Tasks to run after each master is upgraded and system/services have been restarted. +# openshift_master_upgrade_post_hook=/usr/share/custom/post_master.yml # Alternate image format string, useful if you've got your own registry mirror -- cgit v1.2.3