From cbb7f87e39c98bf4d5e0505ba2884585fc616437 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Mon, 16 Nov 2015 14:45:35 -0500 Subject: atomic-openshift-installer: Temporarily restrict to single master For now, we should restrict the quick installer to a single master. This should change in the near future. --- utils/src/ooinstall/cli_installer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 6cdc19f20..9988577f3 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -71,7 +71,7 @@ def delete_hosts(hosts): click.echo("\"{}\" doesn't coorespond to any valid input.".format(del_idx)) return hosts, None -def collect_hosts(): +def collect_hosts(master_set=False): """ Collect host information from user. This will later be filled in using ansible. @@ -108,8 +108,10 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen value_proc=validate_prompt_hostname) host_props['connect_to'] = hostname_or_ip - - host_props['master'] = click.confirm('Will this host be an OpenShift Master?') + if not master_set: + is_master = click.confirm('Will this host be an OpenShift Master?') + host_props['master'] = is_master + master_set = True host_props['node'] = True #TODO: Reenable this option once container installs are out of tech preview @@ -308,7 +310,7 @@ def collect_new_nodes(): Add new nodes here """ click.echo(message) - return collect_hosts() + return collect_hosts(True) def get_installed_hosts(hosts, callback_facts): installed_hosts = [] -- cgit v1.2.3 From 1f5e29de47f64cf1b24f5caf913777c0588ebf6a Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Tue, 17 Nov 2015 13:36:43 -0500 Subject: atomic-openshift-installer: Correct single master case Correct the case where the first host entered is not a master. --- utils/src/ooinstall/cli_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 9988577f3..10949763f 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -111,7 +111,7 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen if not master_set: is_master = click.confirm('Will this host be an OpenShift Master?') host_props['master'] = is_master - master_set = True + master_set = is_master host_props['node'] = True #TODO: Reenable this option once container installs are out of tech preview -- cgit v1.2.3 From f05e8d345ea4eba75574347c969e8552df8b6c17 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Tue, 17 Nov 2015 14:10:34 -0500 Subject: The aep3 images changed locations. --- roles/openshift_facts/library/openshift_facts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 2e1075aca..828ddc49b 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -625,7 +625,7 @@ def set_deployment_facts_if_unset(facts): if deployment_type in ['enterprise', 'online', 'openshift-enterprise']: registry_url = 'openshift3/ose-${component}:${version}' elif deployment_type == 'atomic-enterprise': - registry_url = 'aep3/aep-${component}:${version}' + registry_url = 'aep3_beta/aep-${component}:${version}' facts[role]['registry_url'] = registry_url if 'master' in facts: -- cgit v1.2.3 From 5e8c5c7073a373784709ea7605176b2cabc5de09 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Tue, 17 Nov 2015 14:15:57 -0500 Subject: Automatic commit of package [openshift-ansible] release [3.0.13-1]. --- .tito/packages/openshift-ansible | 2 +- openshift-ansible.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index c2f5784ce..d0cca83a2 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.12-1 ./ +3.0.13-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 21f624400..f2623cdd7 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.0.12 +Version: 3.0.13 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -258,6 +258,12 @@ Atomic OpenShift Utilities includes %changelog +* Tue Nov 17 2015 Brenton Leanhardt 3.0.13-1 +- The aep3 images changed locations. (bleanhar@redhat.com) +- atomic-openshift-installer: Correct single master case (smunilla@redhat.com) +- atomic-openshift-installer: Temporarily restrict to single master + (smunilla@redhat.com) + * Wed Nov 11 2015 Brenton Leanhardt 3.0.12-1 - Sync with the latest image streams (sdodson@redhat.com) -- cgit v1.2.3