From 11bf9fcb21d4e937fa15f96929a08de0f2eef896 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 20 Sep 2022 17:10:54 +0100
Subject: [PATCH 1/3] cephadm: Bump collection to 1.8.0

This fixes several issues.

https://github.com/stackhpc/ansible-collection-cephadm/releases/tag/1.8.0
---
 etc/kayobe/ansible/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/kayobe/ansible/requirements.yml b/etc/kayobe/ansible/requirements.yml
index 52b18f408..a00fa1efc 100644
--- a/etc/kayobe/ansible/requirements.yml
+++ b/etc/kayobe/ansible/requirements.yml
@@ -1,7 +1,7 @@
 ---
 collections:
   - name: stackhpc.cephadm
-    version: 1.7.0
+    version: 1.8.0
   - name: stackhpc.pulp
     version: 0.3.0
   - name: pulp.squeezer

From e90ade1e0778e86b0fa63c7cacbe2449272eb8a8 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 20 Sep 2022 17:11:14 +0100
Subject: [PATCH 2/3] cephadm: use admin overcloud network for SSH access

---
 etc/kayobe/cephadm.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml
index eff49c565..b82111cb7 100644
--- a/etc/kayobe/cephadm.yml
+++ b/etc/kayobe/cephadm.yml
@@ -23,6 +23,9 @@ cephadm_registry_username: "{{ stackhpc_docker_registry_username }}"
 # Ceph container image registry password.
 cephadm_registry_password: "{{ stackhpc_docker_registry_password }}"
 
+# Cephadm admin network interface.
+cephadm_admin_interface: "{{ admin_oc_net_name | net_interface }}"
+
 # Ceph public network interface.
 cephadm_public_interface: "{{ storage_net_name | net_interface }}"
 

From 33172bebec2ffdc2c2702aa46bda50a0c7b5eb1a Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 20 Sep 2022 17:12:03 +0100
Subject: [PATCH 3/3] cephadm: sync only a specific container image tag

Syncing all tags in quay.io/ceph/ceph can take a long time, and may even
fail before getting to the tag we're interested in.
---
 etc/kayobe/pulp.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 2ec7b9762..5805dc92a 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -597,6 +597,7 @@ stackhpc_pulp_repository_container_repos_ceph:
     url: "https://quay.io"
     policy: on_demand
     state: present
+    include_tags: "{{ cephadm_image_tag }}"
     required: "{{ stackhpc_sync_ceph_images | bool }}"
 
 # List of Ceph container image distributions.