diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 12 | ||||
| -rw-r--r-- | utils/src/ooinstall/oo_config.py | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index e1047e700..9839bf447 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -526,10 +526,14 @@ Add new nodes here def get_installed_hosts(hosts, callback_facts): installed_hosts = [] for host in hosts: - if(host.connect_to in callback_facts.keys() - and 'common' in callback_facts[host.connect_to].keys() - and callback_facts[host.connect_to]['common'].get('version', '') - and callback_facts[host.connect_to]['common'].get('version', '') != 'None'): + if host.connect_to in callback_facts.keys() and ( + ('common' in callback_facts[host.connect_to].keys() and + callback_facts[host.connect_to]['common'].get('version', '') and + callback_facts[host.connect_to]['common'].get('version', '') != 'None') \ + or + ('master' in callback_facts[host.connect_to].keys() and + callback_facts[host.connect_to]['master'].get('cluster_method', '') == 'native') + ): installed_hosts.append(host) return installed_hosts diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py index 33ab27567..4861b1b1b 100644 --- a/utils/src/ooinstall/oo_config.py +++ b/utils/src/ooinstall/oo_config.py @@ -10,6 +10,7 @@ PERSIST_SETTINGS = [ 'ansible_ssh_user', 'ansible_config', 'ansible_log_path', + 'master_routingconfig_subdomain', 'variant', 'variant_version', 'version', |