Jelajahi Sumber

Move nested print_read_config_error function into it's own function

Tim Bielawa 8 tahun lalu
induk
melakukan
e1021fc1bb

+ 0 - 4
utils/src/ooinstall/__init__.py

@@ -1,5 +1 @@
-# TODO: Temporarily disabled due to importing old code into openshift-ansible
-# repo. We will work on these over time.
 # pylint: disable=missing-docstring
-
-from .oo_config import OOConfig

+ 1 - 1
utils/src/ooinstall/cli_installer.py

@@ -8,7 +8,7 @@ import sys
 from distutils.version import LooseVersion
 import click
 from ooinstall import openshift_ansible
-from ooinstall import OOConfig
+from ooinstall.oo_config import OOConfig
 from ooinstall.oo_config import OOConfigInvalidHostError
 from ooinstall.oo_config import Host, Role
 from ooinstall.variants import find_variant, get_variant_version_combos

+ 3 - 2
utils/src/ooinstall/oo_config.py

@@ -29,13 +29,14 @@ DEFAULT_REQUIRED_FACTS = ['ip', 'public_ip', 'hostname', 'public_hostname']
 PRECONFIGURED_REQUIRED_FACTS = ['hostname', 'public_hostname']
 
 def print_read_config_error(error, path='the configuration file'):
-            message = """
+    message = """
 Error loading config. {}.
 
 See https://docs.openshift.com/enterprise/latest/install_config/install/quick_install.html#defining-an-installation-configuration-file
 for information on creating a configuration file or delete {} and re-run the installer.
 """
-            print message.format(error, path)
+    print message.format(error, path)
+
 
 class OOConfigFileError(Exception):
     """The provided config file path can't be read/written