From 2fe8715d9935dc7372dab68fa2b93a702265a119 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 27 Jul 2016 09:14:42 -0400 Subject: Add support for Atomic Registry Installs Add the Registry deployment subtype as an option in the quick installer. --- utils/src/ooinstall/variants.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'utils/src/ooinstall/variants.py') diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py index c723c7e61..11817c00e 100644 --- a/utils/src/ooinstall/variants.py +++ b/utils/src/ooinstall/variants.py @@ -16,10 +16,11 @@ installer_log = logging.getLogger('installer') class Version(object): - def __init__(self, name, ansible_key): + def __init__(self, name, ansible_key, subtype=''): self.name = name # i.e. 3.0, 3.1 self.ansible_key = ansible_key + self.subtype = subtype class Variant(object): @@ -43,6 +44,12 @@ OSE = Variant('openshift-enterprise', 'OpenShift Container Platform', ] ) +REG = Variant('openshift-enterprise', 'Registry', + [ + Version('3.2', 'openshift-enterprise', 'registry'), + ] +) + origin = Variant('origin', 'OpenShift Origin', [ Version('1.2', 'origin'), @@ -58,8 +65,8 @@ LEGACY = Variant('openshift-enterprise', 'OpenShift Container Platform', ) # Ordered list of variants we can install, first is the default. -SUPPORTED_VARIANTS = (OSE, origin, LEGACY) -DISPLAY_VARIANTS = (OSE, ) +SUPPORTED_VARIANTS = (OSE, REG, origin, LEGACY) +DISPLAY_VARIANTS = (OSE, REG,) def find_variant(name, version=None): -- cgit v1.2.3 From 517f3390c14bc9bf570581a914fa64ac55c1ccd9 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Thu, 25 Aug 2016 09:20:17 -0400 Subject: Remove atomic check and cockpit.socket --- utils/src/ooinstall/variants.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils/src/ooinstall/variants.py') diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py index 11817c00e..8f82655fd 100644 --- a/utils/src/ooinstall/variants.py +++ b/utils/src/ooinstall/variants.py @@ -45,9 +45,9 @@ OSE = Variant('openshift-enterprise', 'OpenShift Container Platform', ) REG = Variant('openshift-enterprise', 'Registry', - [ - Version('3.2', 'openshift-enterprise', 'registry'), - ] + [ + Version('3.2', 'openshift-enterprise', 'registry'), + ] ) origin = Variant('origin', 'OpenShift Origin', -- cgit v1.2.3