diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-08 10:12:32 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-08 10:12:51 -0500 |
| commit | 62ab67626448edfbf70fd862de0324a8c7252a13 (patch) | |
| tree | 38c21990f188559169dfbf42a4c4f2cbb1ef5e82 /utils/src | |
| parent | 3363ce041ae9543e148d3b53887c6b95100dfd67 (diff) | |
| download | openshift-62ab67626448edfbf70fd862de0324a8c7252a13.tar.gz openshift-62ab67626448edfbf70fd862de0324a8c7252a13.tar.bz2 openshift-62ab67626448edfbf70fd862de0324a8c7252a13.tar.xz openshift-62ab67626448edfbf70fd862de0324a8c7252a13.zip | |
Bug 1287977 - Incorrect check output from atomic-openshift-installer when working with preconfigured load balancer
Diffstat (limited to 'utils/src')
| -rw-r--r-- | utils/src/ooinstall/oo_config.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py index 1be85bc1d..031b82bc1 100644 --- a/utils/src/ooinstall/oo_config.py +++ b/utils/src/ooinstall/oo_config.py @@ -14,7 +14,8 @@ PERSIST_SETTINGS = [ 'variant_version', 'version', ] -REQUIRED_FACTS = ['ip', 'public_ip', 'hostname', 'public_hostname'] +DEFAULT_REQUIRED_FACTS = ['ip', 'public_ip', 'hostname', 'public_hostname'] +PRECONFIGURED_REQUIRED_FACTS = ['hostname', 'public_hostname'] class OOConfigFileError(Exception): @@ -208,7 +209,12 @@ class OOConfig(object): for host in self.hosts: missing_facts = [] - for required_fact in REQUIRED_FACTS: + if host.preconfigured: + required_facts = PRECONFIGURED_REQUIRED_FACTS + else: + required_facts = DEFAULT_REQUIRED_FACTS + + for required_fact in required_facts: if not getattr(host, required_fact): missing_facts.append(required_fact) if len(missing_facts) > 0: |