diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-11-01 11:17:18 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-11-01 11:19:29 -0400 |
| commit | 48861efef6dab6bde2d540ffb362f57f8650b6ba (patch) | |
| tree | 262b4d643a83e2269463a9e393459123f0bd3bb5 | |
| parent | e977242d747f11a0771f4593a936704802ca3f94 (diff) | |
| download | openshift-48861efef6dab6bde2d540ffb362f57f8650b6ba.tar.gz openshift-48861efef6dab6bde2d540ffb362f57f8650b6ba.tar.bz2 openshift-48861efef6dab6bde2d540ffb362f57f8650b6ba.tar.xz openshift-48861efef6dab6bde2d540ffb362f57f8650b6ba.zip | |
Update installation summary for etcd members
We have changed how we assign etcd members in the quick
installer. This updates our messaging to match those changes.
Fixes Bug 1383961
Fixes Bug 1389649
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 12 | ||||
| -rw-r--r-- | utils/src/ooinstall/oo_config.py | 4 |
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(): |