summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-02 11:08:04 -0400
committerGitHub <noreply@github.com>2016-11-02 11:08:04 -0400
commitf232cfd42b3824ee64ce32f78c19616164a6b13a (patch)
tree5a4dffb3cd11f5858d9242300003704791a47128
parentc97858a6bc61251c02d2ca27172ebe87727b776a (diff)
parent48861efef6dab6bde2d540ffb362f57f8650b6ba (diff)
downloadopenshift-f232cfd42b3824ee64ce32f78c19616164a6b13a.tar.gz
openshift-f232cfd42b3824ee64ce32f78c19616164a6b13a.tar.bz2
openshift-f232cfd42b3824ee64ce32f78c19616164a6b13a.tar.xz
openshift-f232cfd42b3824ee64ce32f78c19616164a6b13a.zip
Merge pull request #2695 from smunilla/BZ1383961
Update installation summary for etcd members
-rw-r--r--utils/src/ooinstall/cli_installer.py12
-rw-r--r--utils/src/ooinstall/oo_config.py4
2 files changed, 6 insertions, 10 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 7c7770207..a253a1f03 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -108,11 +108,6 @@ a high-availability (HA) deployment. If you choose an HA deployment, then you
are prompted to identify a *separate* system to act as the load balancer for
your cluster once you define all masters and nodes.
-If only one master is specified, an etcd instance is embedded within the
-OpenShift master service to use as the datastore. This can be later replaced
-with a separate etcd instance, if required. If multiple masters are specified,
-then a separate etcd cluster is configured with each master serving as a member.
-
Any masters configured as part of this installation process are also
configured as nodes. This enables the master to proxy to pods
from the API. By default, this node is unschedulable, but this can be changed
@@ -253,11 +248,8 @@ def print_host_summary(all_hosts, host):
click.echo(" - Load Balancer (Preconfigured)")
else:
click.echo(" - Load Balancer (HAProxy)")
- if host.is_master():
- if host.is_etcd_member(all_hosts):
- click.echo(" - Etcd Member")
- else:
- click.echo(" - Etcd (Embedded)")
+ if host.is_etcd():
+ click.echo(" - Etcd")
if host.is_storage():
click.echo(" - Storage")
if host.new_host:
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py
index e6bff7133..64eb340f3 100644
--- a/utils/src/ooinstall/oo_config.py
+++ b/utils/src/ooinstall/oo_config.py
@@ -120,6 +120,10 @@ class Host(object):
def is_storage(self):
return 'storage' in self.roles
+ def is_etcd(self):
+ """ Does this host have the etcd role """
+ return 'etcd' in self.roles
+
def is_etcd_member(self, all_hosts):
""" Will this host be a member of a standalone etcd cluster. """
if not self.is_master():