Add update|hotfix repo classes
* extra
* saltstack
* ceph
* percona
* docker
* mark as deprecated:
- jenkins
- docker_legacy
- aptly
* Misc: fix arch. variable
Change-Id: I24e3ae14ddc239fd07c2f3b622321538715cb157
Prod-releted: PROD-23765 (PROD:23765)
diff --git a/linux/system/repo/mcp/apt_mirantis/aptly.yml b/linux/system/repo/mcp/apt_mirantis/aptly.yml
index e06597c..5a8600a 100644
--- a/linux/system/repo/mcp/apt_mirantis/aptly.yml
+++ b/linux/system/repo/mcp/apt_mirantis/aptly.yml
@@ -1,3 +1,5 @@
+# Deprecated since 2018.11
+# Will be removed in 2019.q2
classes:
- system.linux.system.repo.keystorage.aptly
parameters:
diff --git a/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
index acb0a5c..ae38324 100644
--- a/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
+++ b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
@@ -1,3 +1,5 @@
+# Deprecated since 2018.11
+# Will be removed in 2019.q2
classes:
- system.linux.system.repo.keystorage.docker_legacy
parameters:
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/ceph.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/ceph.yml
new file mode 100644
index 0000000..040019b
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/ceph.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_ceph_hotfix:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_hotfix_mcp_ceph_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mirror_mirantis_key}
+ architectures: amd64
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/docker.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/docker.yml
new file mode 100644
index 0000000..ccf314f
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/docker.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.docker
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_docker_hotfix:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_hotfix_mcp_docker_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} stable"
+ key: ${_param:linux_system_repo_mcp_docker_key}
+ architectures: amd64
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/extra.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/extra.yml
new file mode 100644
index 0000000..f617eeb
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/extra.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_extra_hotfix:
+ source: "deb ${_param:linux_system_repo_hotfix_mcp_extra_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
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/percona.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/percona.yml
new file mode 100644
index 0000000..ef9c162
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/percona.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.percona
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_percona_hotfix:
+ source: "deb ${_param:linux_system_repo_hotfix_mcp_percona_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mcp_percona_key}
+ architectures: amd64
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/saltstack.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/saltstack.yml
new file mode 100644
index 0000000..ec39056
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/saltstack.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.saltstack
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_saltstack_hotfix:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_hotfix_mcp_saltstack_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mcp_saltstack_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/jenkins.yml b/linux/system/repo/mcp/apt_mirantis/jenkins.yml
index 55cebad..d17d264 100644
--- a/linux/system/repo/mcp/apt_mirantis/jenkins.yml
+++ b/linux/system/repo/mcp/apt_mirantis/jenkins.yml
@@ -1,3 +1,5 @@
+# Deprecated since 2018.11
+# Will be removed in 2019.q2
classes:
- system.linux.system.repo.keystorage.jenkins
parameters:
diff --git a/linux/system/repo/mcp/apt_mirantis/update/ceph.yml b/linux/system/repo/mcp/apt_mirantis/update/ceph.yml
new file mode 100644
index 0000000..db9b61f
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/ceph.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_ceph_update:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_update_mcp_ceph_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
diff --git a/linux/system/repo/mcp/apt_mirantis/update/docker.yml b/linux/system/repo/mcp/apt_mirantis/update/docker.yml
new file mode 100644
index 0000000..fe619f1
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/docker.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.docker
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_docker_update:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_update_mcp_docker_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} stable"
+ key: ${_param:linux_system_repo_mcp_docker_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/update/extra.yml b/linux/system/repo/mcp/apt_mirantis/update/extra.yml
new file mode 100644
index 0000000..0e7a9f6
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/extra.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_extra_update:
+ source: "deb ${_param:linux_system_repo_update_mcp_extra_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
diff --git a/linux/system/repo/mcp/apt_mirantis/update/percona.yml b/linux/system/repo/mcp/apt_mirantis/update/percona.yml
new file mode 100644
index 0000000..99efc0d
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/percona.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.percona
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_percona_update:
+ source: "deb ${_param:linux_system_repo_update_mcp_percona_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mcp_percona_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/update/salt-formulas.yml b/linux/system/repo/mcp/apt_mirantis/update/salt-formulas.yml
index 74868d5..27755df 100644
--- a/linux/system/repo/mcp/apt_mirantis/update/salt-formulas.yml
+++ b/linux/system/repo/mcp/apt_mirantis/update/salt-formulas.yml
@@ -7,5 +7,5 @@
mcp_salt_update:
source: "deb [arch=amd64] ${_param:linux_system_repo_update_mcp_salt_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
key: ${_param:linux_system_repo_mirror_mirantis_key}
- architectures: amd64
+ architectures: ${_param:linux_system_architecture}
clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/update/saltstack.yml b/linux/system/repo/mcp/apt_mirantis/update/saltstack.yml
new file mode 100644
index 0000000..b1c80fb
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/saltstack.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.saltstack
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_saltstack_update:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_update_mcp_saltstack_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mcp_saltstack_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml
index 07e95da..6635d9b 100644
--- a/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/update/ubuntu.yml
@@ -5,15 +5,15 @@
# ubuntu_update:
# refresh_db: ${_param:linux_repo_refresh_db}
# source: "deb [arch=amd64] ${_param:linux_system_repo_update_ubuntu_url} ${_param:linux_system_codename} main restricted universe"
-# architectures: amd64
+# architectures: ${_param:linux_system_architecture}
# default: true
# ubuntu_updates_update:
# refresh_db: ${_param:linux_repo_refresh_db}
# source: "deb [arch=amd64] ${_param:linux_system_repo_update_ubuntu_url} ${_param:linux_system_codename}-updates main restricted universe"
-# architectures: amd64
+# architectures: ${_param:linux_system_architecture}
# default: true
ubuntu_security_update:
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] ${_param:linux_system_repo_update_ubuntu_url} ${_param:linux_system_codename}-security main restricted universe"
- architectures: amd64
+ architectures: ${_param:linux_system_architecture}
default: true