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_local/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
index d510183..ab5758c 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
@@ -1,23 +1,23 @@
+classes:
+- system.repo.keystorage.ubuntu
parameters:
+ _param:
+ apt_mk_version: 'stable'
linux:
system:
repo:
ubuntu:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename} main universe restricted"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename} main universe restricted"
architectures: amd64
default: true
- key_url: "http://${_param:local_repo_url}/public.gpg"
- ubuntu-updates:
+ ubuntu_updates:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
architectures: amd64
default: true
- key_url: "http://${_param:local_repo_url}/public.gpg"
- ubuntu-security:
+ ubuntu_security:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
architectures: amd64
default: true
- key_url: "http://${_param:local_repo_url}/public.gpg"
-
diff --git a/linux/system/repo_local/ubuntu.yml b/linux/system/repo_local/ubuntu.yml
index 46994ee..e93a4b3 100644
--- a/linux/system/repo_local/ubuntu.yml
+++ b/linux/system/repo_local/ubuntu.yml
@@ -8,13 +8,13 @@
architectures: amd64
default: true
key_url: "http://${_param:local_repo_url}/public.gpg"
- ubuntu-updates:
+ ubuntu_updates:
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
architectures: amd64
default: true
key_url: "http://${_param:local_repo_url}/public.gpg"
- ubuntu-security:
+ ubuntu_security:
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
architectures: amd64