Merge "Switch Ceph Aptly mirror to apt.mirantis.com"
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 61d7ee2..0a21a55 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -205,6 +205,10 @@
dist: xenial
build: pipeline
branch: debian/xenial
+ - package: python-backports.ssl-match-hostname
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
template:
type: workflow-scm
concurrent: false
diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index 483c302..40c8d87 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -7,8 +7,11 @@
system:
repo:
mcp_ceph:
- source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_ceph_version}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/ ${_param:linux_system_codename} main"
+ source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_ceph_version} ceph-${_param:linux_system_repo_mcp_ceph_codename}"
architectures: amd64
- key_id: E84AC2C0460F3994
- key_server: keyserver.ubuntu.com
- clean_file: true
\ No newline at end of file
+ key_url: "http://apt.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
+ priority: 1100
+ package: '*'