summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-18 14:24:56 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-18 14:24:56 -0400
commit09532223570682737e9bb9d25ef4eb480cbdf3e2 (patch)
treeef8a0fce35831c4b611eb36e68711e9d0d0289d5 /utils/src/ooinstall
parent9c2fffb769ba17664d5c5fe219c3f899a14aae61 (diff)
parent1d08d9a06689b2a49a9028040e3317abc775fe2f (diff)
downloadopenshift-09532223570682737e9bb9d25ef4eb480cbdf3e2.tar.gz
openshift-09532223570682737e9bb9d25ef4eb480cbdf3e2.tar.bz2
openshift-09532223570682737e9bb9d25ef4eb480cbdf3e2.tar.xz
openshift-09532223570682737e9bb9d25ef4eb480cbdf3e2.zip
Merge pull request #1764 from smunilla/BZ1327139
a-o-i: Don't assume storage on 1st master
Diffstat (limited to 'utils/src/ooinstall')
-rw-r--r--utils/src/ooinstall/cli_installer.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index dd9d517f1..aaf3b7972 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -163,11 +163,10 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen
if masters_set or num_masters != 2:
more_hosts = click.confirm('Do you want to add additional hosts?')
- if num_masters == 1:
- master = next((host for host in hosts if host.master), None)
- master.storage = True
- elif num_masters >= 3:
+ if num_masters >= 3:
collect_master_lb(hosts)
+
+ if not existing_env:
collect_storage_host(hosts)
return hosts
@@ -306,12 +305,17 @@ def collect_storage_host(hosts):
message = """
Setting up High Availability Masters requires a storage host. Please provide a
host that will be configured as a Registry Storage.
+
+Note: Containerized storage hosts are not currently supported.
"""
click.echo(message)
host_props = {}
+ first_master = next(host for host in hosts if host.master)
+
hostname_or_ip = click.prompt('Enter hostname or IP address',
- value_proc=validate_prompt_hostname)
+ value_proc=validate_prompt_hostname,
+ default=first_master)
existing, existing_host = is_host_already_node_or_master(hostname_or_ip, hosts)
if existing and existing_host.node:
existing_host.storage = True