diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 11 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 2 | ||||
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 11 |
6 files changed, 21 insertions, 10 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 4daa2cb96..56c99bf4c 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.4.6-1 ./ +3.4.7-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 5aaa4c2bc..bf0f1f3e2 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.4.6 +Version: 3.4.7 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -249,6 +249,15 @@ Atomic OpenShift Utilities includes %changelog +* Wed Oct 12 2016 Troy Dawson <tdawson@redhat.com> 3.4.7-1 +- set defaults for debug_level in template and task (jhcook@gmail.com) +- Set HTTPS_PROXY in example builddefaults_json (sdodson@redhat.com) +- Fix config and namespace for registry volume detection (sdodson@redhat.com) +- Apply same pattern to HA master services (sdodson@redhat.com) +- Improve how we handle containerized node failure on first startup + (sdodson@redhat.com) +- Check that OpenStack hostnames are resolvable (lhuard@amadeus.com) + * Mon Oct 10 2016 Troy Dawson <tdawson@redhat.com> 3.4.6-1 - Retry failed master startup once (ironcladlou@gmail.com) - [logging] Fix openshift_hosted_logging_fluentd_nodeselector diff --git a/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml index f5e4d807e..af77f140f 100644 --- a/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/rpm_upgrade.yml @@ -5,6 +5,3 @@ - name: Ensure python-yaml present for config upgrade action: "{{ ansible_pkg_mgr }} name=PyYAML state=present" when: not openshift.common.is_atomic | bool - -- name: Restart node service - service: name="{{ openshift.common.service_type }}-node" state=restarted diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index 10eaeb401..26f0240ec 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -1,4 +1,4 @@ -OPTIONS=--loglevel={{ openshift.master.debug_level }} +OPTIONS=--loglevel={{ openshift.master.debug_level | default(2) }} CONFIG_FILE={{ openshift_master_config_file }} {% if openshift.common.is_containerized | bool %} IMAGE_VERSION={{ openshift_image_tag }} diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index a2192a4d0..40d1dd50b 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -40,7 +40,7 @@ create: true with_items: - regex: '^OPTIONS=' - line: "OPTIONS=--loglevel={{ openshift.node.debug_level }}" + line: "OPTIONS=--loglevel={{ openshift.node.debug_level | default(2) }}" - regex: '^CONFIG_FILE=' line: "CONFIG_FILE={{ openshift_node_config_file }}" - regex: '^IMAGE_VERSION=' diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 8f4e6af30..85f18d5d3 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -44,9 +44,9 @@ UPGRADE_MAPPINGS = { '3.2': { 'minor_version': '3.2', 'minor_playbook': 'v3_2/upgrade.yml', - 'major_playbook': 'v3_2/upgrade.yml', + 'major_playbook': 'v3_3/upgrade.yml', 'major_version': '3.3', - } + }, } @@ -930,7 +930,12 @@ def upgrade(ctx, latest_minor, next_major): sys.exit(0) old_version = oo_cfg.settings['variant_version'] - mapping = UPGRADE_MAPPINGS.get(old_version) + + try: + mapping = UPGRADE_MAPPINGS[old_version] + except KeyError: + click.echo('No upgrades available for %s %s' % (variant, old_version)) + sys.exit(0) message = """ This tool will help you upgrade your existing OpenShift installation. |