From 66a13d7f8c6b54b230886f48c901d5cd5be78a74 Mon Sep 17 00:00:00 2001
From: Erik Berg <openstack@slipsprogrammor.no>
Date: Tue, 18 Feb 2020 09:00:14 +0100
Subject: [PATCH] pin ceph packages to release o=Ubuntu on rocky/bionic

When you're installing ceph on ubuntu/bionic, the luminous release isn't
readily available from ceph.com, and you end up pulling mimic packages
from uca instead. Fortunately luminous packages are available in the
distro repo.

apt-cache policy examples;
uca: release o=Canonical,a=bionic-updates,n=bionic-updates/rocky,c=main,b=amd64
ceph: release o=ceph.com,a=stable,n=bionic,c=main,b=amd64
ubuntu: release v=18.04,o=Ubuntu,a=bionic-backports,n=bionic,l=Ubuntu,c=main,b=amd64

Change-Id: I34cec9224e1367730ab4bed02abc499a65d9f53e
---
 playbooks/ceph-install.yml     | 4 ++--
 playbooks/ceph-rgw-install.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/ceph-install.yml b/playbooks/ceph-install.yml
index 6987d9fee4..42c3ed4704 100644
--- a/playbooks/ceph-install.yml
+++ b/playbooks/ceph-install.yml
@@ -99,7 +99,7 @@
       vars:
         apt_package_pinning_file_name: "ceph_community_pin.pref"
         apt_package_pinning_priority: "{{ (ceph_repository == 'community') | ternary(1000, 100) }}"
-        apt_pinned_packages: [{ package: '*', release: 'ceph.com' }]
+        apt_pinned_packages: [{ package: '*', release: "{{ (ansible_distribution_release == 'bionic') | ternary('Ubuntu', 'ceph.com') }}" }]
       when:
         - ansible_pkg_mgr == 'apt'
 
@@ -203,7 +203,7 @@
       vars:
         apt_package_pinning_file_name: "ceph_community_pin.pref"
         apt_package_pinning_priority: "{{ (ceph_repository == 'community') | ternary(1000, 100) }}"
-        apt_pinned_packages: [{ package: '*', release: 'ceph.com' }]
+        apt_pinned_packages: [{ package: '*', release: "{{ (ansible_distribution_release == 'bionic') | ternary('Ubuntu', 'ceph.com') }}" }]
       when:
         - ansible_pkg_mgr == 'apt'
 
diff --git a/playbooks/ceph-rgw-install.yml b/playbooks/ceph-rgw-install.yml
index 352a0ad518..f270187456 100644
--- a/playbooks/ceph-rgw-install.yml
+++ b/playbooks/ceph-rgw-install.yml
@@ -49,7 +49,7 @@
       vars:
         apt_package_pinning_file_name: "ceph_community_pin.pref"
         apt_package_pinning_priority: "{{ (ceph_repository == 'community') | ternary(1000, 100) }}"
-        apt_pinned_packages: [{ package: '*', release: 'ceph.com' }]
+        apt_pinned_packages: [{ package: '*', release: "{{ (ansible_distribution_release == 'bionic') | ternary('Ubuntu', 'ceph.com') }}" }]
       when:
         - ansible_pkg_mgr == 'apt'