Mirrors update
* Debmirror:
- fix path's
- add maas-xenial mirror
- remove multiverse from ubuntu-xenial mirror
* Maas:
- fix path's
- fix ephernal path
* Split repos:
- Switch to maas ppa, include key
- Add jenkins ppa, include key
- Allign '-' => '_' for ubuntu mirrors
* Don't use online key-storage
- add same structure for repo|_local keys
Change-Id: I01270d21022d1c4b389961fa39a746b0c3fa32f0
diff --git a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
index e254ed6..472dc63 100644
--- a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
@@ -1,24 +1,25 @@
+classes:
+- system.repo.keystorage.ubuntu
parameters:
_param:
- apt_mk_version: stable
+ apt_mk_version: 'stable'
+ linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
+ linux_system_repo_ubuntu_url: ${_param:linux_system_repo_url}/ubuntu/
linux:
system:
repo:
ubuntu:
- source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename} main restricted universe"
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] ${_param:linux_system_repo_ubuntu_url} ${_param:linux_system_codename} main restricted universe"
architectures: amd64
default: true
- key_id: 437D05B5
- key_server: keyserver.ubuntu.com
ubuntu_updates:
- source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe"
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] ${_param:linux_system_repo_ubuntu_url} ${_param:linux_system_codename}-updates main restricted universe"
architectures: amd64
default: true
- key_id: 437D05B5
- key_server: keyserver.ubuntu.com
ubuntu_security:
- source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename}-security main restricted universe"
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] ${_param:linux_system_repo_ubuntu_url} ${_param:linux_system_codename}-security main restricted universe"
architectures: amd64
default: true
- key_id: 437D05B5
- key_server: keyserver.ubuntu.com
\ No newline at end of file