Merge pull request #250 from rcbops/CEPHSTORA-461_master_dep_update

README.md

@@ -8,7 +8,7 @@ versions of ``ceph-ansible`` used in RPC deployments.
 
 ## Current versions of ceph-ansible & Ansible
 
-### **ceph-ansible version:** v3.0.45
+### **ceph-ansible version:** v3.0.46
 
 ### **Ansible version:** 2.4.4.0
 

ansible-role-requirements.yml

@@ -1,7 +1,7 @@
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: v3.0.45
+  version: v3.0.46
 - name: rsyslog_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
@@ -25,11 +25,11 @@
 - name: grafana
   scm: git
   src: https://github.com/ansiblebit/grafana
-  version: 2.14.2
+  version: 2.24.4
 - name: alertmanager
   scm: git
   src: https://github.com/cloudalchemy/ansible-alertmanager
-  version: 0.13.4
+  version: 0.13.5
 - name: ../ceph_plugins
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-plugins

component_requirements.yml

@@ -1,8 +1,8 @@
 # Do not modify by hand. This file is automatically generated from the required dependencies and the constraints specified for them.
 dependencies:
 - name: rpc-maas
-  ref: 1.7.7
+  ref: 1.7.9
   ref_type: tag
   repo_url: https://github.com/rcbops/rpc-maas
-  sha: 037cc33aa66673b0bea6ced749d8511d1c45deb1
-  version: 1.7.7
+  sha: 57a3999c02cdc4a11e2d2f16739b4ada623567be
+  version: 1.7.9

playbooks/rolling_update.yml

@@ -184,8 +184,7 @@
       command: ceph --cluster {{ cluster }} osd set {{ item }}
       with_items:
         - noout
-        - noscrub
-        - nodeep-scrub
+        - norebalance
       delegate_to: "{{ mon_host }}"
       when: not containerized_deployment
 
@@ -194,8 +193,7 @@
         docker exec ceph-mon-{{ hostvars[mon_host]['ansible_hostname'] }} ceph --cluster {{ cluster }} osd set {{ item }}
       with_items:
         - noout
-        - noscrub
-        - nodeep-scrub
+        - norebalance
       delegate_to: "{{ mon_host }}"
       when: containerized_deployment
 
@@ -358,9 +356,7 @@
       command: "{{ docker_exec_cmd_update_osd|default('') }} ceph --cluster {{ cluster }} -s --format json"
       register: ceph_health_post
       until: >
-        ((ceph_health_post.stdout | from_json).pgmap.pgs_by_state | length) == 1
-        and
-        (ceph_health_post.stdout | from_json).pgmap.pgs_by_state.0.state_name == "active+clean"
+        ((ceph_health_post.stdout | from_json).pgmap.pgs_by_state | selectattr('state_name', 'search', '^active\\+clean') | map(attribute='count') | list | sum) == (ceph_pgs.stdout | from_json).pgmap.num_pgs
       delegate_to: "{{ groups[mon_group_name][0] }}"
       retries: "{{ health_osd_check_retries }}"
       delay: "{{ health_osd_check_delay }}"
@@ -391,8 +387,7 @@
       command: "{{ docker_exec_cmd_update_osd|default('') }} ceph osd unset {{ item }} --cluster {{ cluster }}"
       with_items:
         - noout
-        - noscrub
-        - nodeep-scrub
+        - norebalance
       delegate_to: "{{ groups[mon_group_name][0] }}"
 
     - name: get osd versions

releasenotes/notes/update_deps-e4dd0e22e42361a1.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - Bump ceph-ansible version from v3.0.45 to v3.0.46
+  - Bump grafana version from 2.14.2 to 2.24.4
+  - Bump alertmanager version from 0.13.4 to 0.13.5
+  - Bump rpc-maas version from 1.7.7 to 1.7.9