Update apt_mirantis/openstack.yml
* Switch to mirror.mirantis.com
Related-Bug: PROD-17862 (PROD:17862)
Related-Bug: PROD-21071 (PROD:21071)
Change-Id: I6a75babae35a1b584c9872a28d6518c239dba42e
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
index ae259af..c1483ac 100644
--- a/linux/system/repo/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -1,24 +1,38 @@
classes:
- system.linux.system.repo.keystorage.mirantis_com
parameters:
- _param:
- linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
linux:
system:
repo:
mirantis_openstack:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
- architectures: amd64
- key: ${_param:linux_system_repo_apt_mirantis_key}
+ source: "deb ${_param:linux_system_repo_mirantis_openstack_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mirror_mirantis_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
pin:
- - pin: 'release l=${_param:openstack_version}'
+ - pin: 'release o=Mirantis'
priority: 1100
package: '*'
- mk_openstack:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
- architectures: amd64
- key: ${_param:linux_system_repo_apt_mirantis_key}
- pin:
- - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
- priority: 1100
- package: '*'
+# DEPRECATED since 2018.10+ release.
+#parameters:
+# _param:
+# linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+# linux:
+# system:
+# repo:
+# mirantis_openstack:
+# source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
+# architectures: amd64
+# key: ${_param:linux_system_repo_apt_mirantis_key}
+# pin:
+# - pin: 'release l=${_param:openstack_version}'
+# priority: 1100
+# package: '*'
+# mk_openstack:
+# source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
+# architectures: amd64
+# key: ${_param:linux_system_repo_apt_mirantis_key}
+# pin:
+# - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
+# priority: 1100
+# package: '*'
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
deleted file mode 100644
index 8a9a3a7..0000000
--- a/linux/system/repo/mcp/mirror/v1/openstack.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-classes:
-- system.linux.system.repo.keystorage.mirantis_com
-parameters:
- linux:
- system:
- repo:
- mirantis_openstack:
- source: "deb ${_param:linux_system_repo_mirantis_openstack_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
- key: ${_param:linux_system_repo_mirror_mirantis_key}
- architectures: ${_param:linux_system_architecture}
- clean_file: true
- pin:
- - pin: 'release o=Mirantis'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
new file mode 120000
index 0000000..d53dbf7
--- /dev/null
+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
@@ -0,0 +1 @@
+../../apt_mirantis/openstack.yml
\ No newline at end of file