diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 53 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 2 | ||||
| -rw-r--r-- | roles/container_runtime/defaults/main.yml | 10 | ||||
| -rw-r--r-- | roles/container_runtime/tasks/systemcontainer_crio.yml | 2 |
5 files changed, 66 insertions, 3 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 1266921a6..3ab6b3fb1 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.9.0-0.41.0 ./ +3.9.0-0.42.0 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index ae0104b27..531aa63b3 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -10,7 +10,7 @@ Name: openshift-ansible Version: 3.9.0 -Release: 0.41.0%{?dist} +Release: 0.42.0%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 URL: https://github.com/openshift/openshift-ansible @@ -201,6 +201,57 @@ Atomic OpenShift Utilities includes %changelog +* Fri Feb 09 2018 Justin Pierce <jupierce@redhat.com> 3.9.0-0.42.0 +- xPaaS v1.4.8 for v3.7 (sdodson@redhat.com) +- xPaaS v1.4.8-1 for v3.8 (sdodson@redhat.com) +- xPaaS v1.4.8-1 for v3.9 (sdodson@redhat.com) +- Bump xpaas version (sdodson@redhat.com) +- Bug 1524805- CFME example now works disconnected (fabian@fabianism.us) +- Only try to yaml.load a file if it ends in .yml or .yaml in logging facts + (ewolinet@redhat.com) +- Set default image tag to openshift_image_tag for services + (vrutkovs@redhat.com) +- Redeploy router certificates during upgrade only when secure. + (kwoodson@redhat.com) +- GlusterFS: Fix block StorageClass heketi route (jarrpa@redhat.com) +- changed oc to {{ openshift_client_binary }} (datarace101@gmail.com) +- Use v3.9 web-console image for now (sdodson@redhat.com) +- Adding ability to provide additional mounts to crio system container. + (kwoodson@redhat.com) +- Remove spaces introduced at the start of the line + (geoff.newson@googlemail.com) +- Changing the check for the number of etcd nodes (geoff.newson@gmail.com) +- aws ami: make it so the tags from the orinal AMI are used with the newly + created AMI (mwoodson@redhat.com) +- Setup docker excluder if requested before container_runtime is installed + (vrutkovs@redhat.com) +- openshift_node: Remove master from aws node building (smilner@redhat.com) +- Use wait_for_connection to validate ssh transport is alive + (sdodson@redhat.com) +- Bug 1541625- properly cast provided ip address to unicode + (fabian@fabianism.us) +- Add base package installation to upgrade playbooks (rteague@redhat.com) +- 3.9 upgrade: fix typos in restart masters procedure (vrutkovs@redhat.com) +- quick installer: disable broken test_get_hosts_to_run_on6 test + (vrutkovs@redhat.com) +- Quick installer: run prerequistes first and update path to main playbook + (vrutkovs@redhat.com) +- Fix uninstall using openshift_prometheus_state=absent (zgalor@redhat.com) +- Detect config changes in console liveness probe (spadgett@redhat.com) +- Fix master and node system container variables (mgugino@redhat.com) +- Correct the list of certificates checked in openshift_master_certificates + s.t. masters do not incorrectly report that master certs are missing. + (abutcher@redhat.com) +- tag fix without ose- (rcook@redhat.com) +- lib_utils_oo_collect: Allow filtering on dot separated keys. + (abutcher@redhat.com) +- Determine which etcd host is the etcd_ca_host rather than assume it is the + first host in the etcd host group. (abutcher@redhat.com) +- Attempt to back up generated certificates on every etcd host. + (abutcher@redhat.com) +- Remove pre upgrade verification step re: etcd ca host. (abutcher@redhat.com) +- Revert "GlusterFS: Remove image option from heketi command" (hansmi@vshn.ch) + * Wed Feb 07 2018 Justin Pierce <jupierce@redhat.com> 3.9.0-0.41.0 - Allow OVS 2.7 in OCP 3.10 (sdodson@redhat.com) - GlusterFS: Minor documentation update (jarrpa@redhat.com) diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml index fafbd8d1c..86cde2844 100644 --- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml @@ -134,7 +134,7 @@ # Run the redeploy certs based upon the certificates. Defaults to False for insecure registries - when: (hostvars[groups.oo_first_master.0].openshift_hosted_rollout_certs_and_registry | default(False)) | bool - import_playbook: ../../../openshift-hosted/redeploy-registry-certificates.yml + import_playbook: ../../../openshift-hosted/private/redeploy-registry-certificates.yml # Check for warnings to be printed at the end of the upgrade: - name: Clean up and display warnings diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index 7397e2bec..22e16d29d 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -94,6 +94,16 @@ l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}" l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}" +# this is a list of dictionaries of mounts +# container_runtime_crio_additional_mounts: +# - destination: /test +# source: /var/test +# options: +# - rw +# - mode=755 +container_runtime_crio_additional_mounts: [] + +l_crio_additional_mounts: "{{ ',' + (container_runtime_crio_additional_mounts | lib_utils_oo_l_of_d_to_csv) if container_runtime_crio_additional_mounts != [] else '' }}" openshift_crio_image_tag_default: "latest" diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml index d588f2618..f053bdea5 100644 --- a/roles/container_runtime/tasks/systemcontainer_crio.yml +++ b/roles/container_runtime/tasks/systemcontainer_crio.yml @@ -53,6 +53,8 @@ name: "cri-o" image: "{{ l_crio_image }}" state: latest + values: + - "ADDTL_MOUNTS={{ l_crio_additional_mounts }}" - name: Remove CRI-O default configuration files file: |