diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 16 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 1 |
4 files changed, 20 insertions, 2 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 120ce408f..bf76a3913 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.9.0-0.38.0 ./ +3.9.0-0.39.0 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index d14eb56cb..1ec707543 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -10,7 +10,7 @@ Name: openshift-ansible Version: 3.9.0 -Release: 0.38.0%{?dist} +Release: 0.39.0%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 URL: https://github.com/openshift/openshift-ansible @@ -201,6 +201,20 @@ Atomic OpenShift Utilities includes %changelog +* Tue Feb 06 2018 Justin Pierce <jupierce@redhat.com> 3.9.0-0.39.0 +- Update code to not fail when rc != 0 (kwoodson@redhat.com) +- Upgrades: pass openshift_manage_node_is_master to master nodes during upgrade + (vrutkovs@redhat.com) +- Updates to configure monitoring container. (kwoodson@redhat.com) +- Move cert SAN update logic to openshift-etcd (rteague@redhat.com) +- Swapping container order for es pod (ewolinet@redhat.com) +- Adding support for ES 5.x tech preview opt in (ewolinet@redhat.com) +- bug 1540799: openshift_prometheus: update alertmanager config file flag + (pgier@redhat.com) +- parameterize various master scale group bits (jdiaz@redhat.com) +- Use rollout instead of deploy (deprecated) (rteague@redhat.com) +- cri-o: export variables defined in crio-network (gscrivan@redhat.com) + * Mon Feb 05 2018 Justin Pierce <jupierce@redhat.com> 3.9.0-0.38.0 - Moving upgrade sg playbook to 3.9 (kwoodson@redhat.com) - remove openshift_upgrade_{pre,post}_storage_migration_enabled from diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml index f44ab3580..9c927c0a1 100644 --- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml @@ -119,6 +119,9 @@ - shell: > echo -n | openssl s_client -showcerts -servername docker-registry.default.svc -connect docker-registry.default.svc:5000 | openssl x509 -text | grep -A1 'X509v3 Subject Alternative Name:' | grep -Pq 'DNS:docker-registry\.default\.svc(,|$)' register: cert_output + changed_when: false + failed_when: + - cert_output.rc not in [0, 1] # Step 2: Set a fact to be used to determine if we should run the redeploy of registry certs - name: set a fact to include the registry certs playbook if needed diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index baec057f9..40e245d75 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -317,3 +317,4 @@ tasks_from: config.yml vars: openshift_master_host: "{{ groups.oo_first_master.0 }}" + openshift_manage_node_is_master: true |