From 2a830f458e6512c3b6305934a650ba23d234a8ac Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Thu, 1 Sep 2016 14:29:10 -0300 Subject: Support openshift_upgrade_dry_run=true for pre-upgrade checks only. --- inventory/byo/hosts.origin.example | 2 ++ inventory/byo/hosts.ose.example | 3 +++ 2 files changed, 5 insertions(+) (limited to 'inventory') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 8b3a6e403..e1d32b166 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -99,6 +99,8 @@ openshift_release=v1.2 # modify image streams to point at that registry by setting the following to true #openshift_examples_modify_imagestreams=true +# Perform only pre-upgrade checks, and exit. +# openshift_upgrade_dry_run=true # Origin copr repo #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}] diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index af653f850..433404ddb 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -99,6 +99,9 @@ openshift_release=v3.2 # modify image streams to point at that registry by setting the following to true #openshift_examples_modify_imagestreams=true +# Perform only pre-upgrade checks, and exit. +# openshift_upgrade_dry_run=true + # Additional yum repos to install #openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', 'baseurl': 'http://example.com/puddle/build/AtomicOpenShift/3.1/latest/RH7-RHOSE-3.0/$basearch/os', 'enabled': 1, 'gpgcheck': 0}] -- cgit v1.2.1 From de196a56aec48a6545d993dae9e739ad9ab511ba Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Wed, 28 Sep 2016 11:53:49 -0300 Subject: Use pre_upgrade tag instread of a dry run variable. --- inventory/byo/hosts.origin.example | 3 --- inventory/byo/hosts.ose.example | 3 --- 2 files changed, 6 deletions(-) (limited to 'inventory') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index e1d32b166..200918853 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -99,9 +99,6 @@ openshift_release=v1.2 # modify image streams to point at that registry by setting the following to true #openshift_examples_modify_imagestreams=true -# Perform only pre-upgrade checks, and exit. -# openshift_upgrade_dry_run=true - # Origin copr repo #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}] diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 433404ddb..af653f850 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -99,9 +99,6 @@ openshift_release=v3.2 # modify image streams to point at that registry by setting the following to true #openshift_examples_modify_imagestreams=true -# Perform only pre-upgrade checks, and exit. -# openshift_upgrade_dry_run=true - # Additional yum repos to install #openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', 'baseurl': 'http://example.com/puddle/build/AtomicOpenShift/3.1/latest/RH7-RHOSE-3.0/$basearch/os', 'enabled': 1, 'gpgcheck': 0}] -- cgit v1.2.1