Sync in latest charms.ceph backports

As a tiny drive-by, this change also updates the sync script to
pull from the stable/pacific branch of charms.ceph, and to use
the upstream opendev.org repository for the sync.

Change-Id: I25b5d89078f71efd01d903d4d2b60ec92074901c

Makefile

@@ -25,7 +25,7 @@ ch-sync: bin/charm_helpers_sync.py
 	$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
 
 ceph-sync:  bin/git_sync.py
-	$(PYTHON) bin/git_sync.py -d lib -s https://github.com/openstack/charms.ceph.git
+	$(PYTHON) bin/git_sync.py --branch stable/pacific -d lib -s https://opendev.org/openstack/charms.ceph.git
 
 sync: ch-sync
 

lib/charms_ceph/utils.py

@@ -1167,7 +1167,10 @@ osd_upgrade_caps = collections.OrderedDict([
 ])
 
 rbd_mirror_caps = collections.OrderedDict([
-    ('mon', ['profile rbd; allow r']),
+    ('mon', ['allow profile rbd-mirror-peer',
+             'allow command "service dump"',
+             'allow command "service status"'
+             ]),
     ('osd', ['profile rbd']),
     ('mgr', ['allow r']),
 ])
@@ -1230,12 +1233,6 @@ def get_named_key(name, caps=None, pool_list=None):
                 'get',
                 key_name,
             ]).decode('UTF-8')).strip()
-        # NOTE(jamespage);
-        # Apply any changes to key capabilities, dealing with
-        # upgrades which requires new caps for operation.
-        upgrade_key_caps(key_name,
-                         caps or _default_caps,
-                         pool_list)
         return parse_key(output)
     except subprocess.CalledProcessError:
         # Couldn't get the key, time to create it!

test-requirements.txt

@@ -42,7 +42,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack
 
 # Needed for charm-glance:
-git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
+git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
+tempest<31.0.0;python_version<'3.8' and python_version>='3.6'
 tempest<24.0.0;python_version<'3.6'
 
 croniter            # needed for charm-rabbitmq-server unit tests