Merge "Refresh ceph repo"
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 435f38e..f3939db 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -10,6 +10,7 @@
# Per repos
linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
+ linux_system_repo_mcp_ceph_url: ${_param:linux_system_repo_url}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/
linux_system_repo_mcp_docker_legacy_url: ${_param:linux_system_repo_url}/docker-1.x/
linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
@@ -35,4 +36,4 @@
linux_system_repo_mcp_cassandra_version: '21x'
linux_system_repo_mcp_glusterfs_version_number: "3.8"
linux_system_repo_mcp_saltstack_version_number: "${_param:salt_version}"
- linux_system_repo_mcp_ceph_codename: 'luminous'
+ linux_system_repo_mcp_ceph_codename: luminous
diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index c5350ce..12011ac 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -1,18 +1,32 @@
classes:
- system.linux.system.repo.keystorage.mirantis_com
parameters:
- _param:
- linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
- linux_system_repo_mcp_ceph_codename: luminous
linux:
system:
repo:
mcp_ceph:
- 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}"
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_ceph_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mirror_mirantis_key}
architectures: amd64
- key: ${_param:linux_system_repo_apt_mirantis_key}
clean_file: true
pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
+ - pin: 'release o=Mirantis'
priority: 1100
package: '*'
+# Deprecated since 2018.11+
+#parameters:
+# _param:
+# linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+# linux_system_repo_mcp_ceph_codename: luminous
+# linux:
+# system:
+# repo:
+# mcp_ceph:
+# 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: ${_param:linux_system_repo_apt_mirantis_key}
+# clean_file: true
+# pin:
+# - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
+# priority: 1100
+# package: '*'