Add update|hotfix repo classes
* fluentd
* elastic
* Misc: fix arch. variable
Prod-related: PROD-23765 (PROD:23765)
Change-Id: If5997c29e1d12c68d4abd8a3f83b6eb21a8add99
(cherry picked from commit 715a757d13aec6757db5f2bd267840544d1156cf)
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 44abc9d..a6c2409 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -9,12 +9,21 @@
linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:mcp_version}/
# Per repos
linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
- linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
- linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-${_param:elasticsearch_version}.x/
linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
linux_system_repo_mcp_influxdb_url: ${_param:linux_system_repo_url}/influxdb/
linux_system_repo_mcp_maas_url: ${_param:linux_system_repo_url}/maas/
+ #
+ linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
+ linux_system_repo_mcp_update_elasticsearch_curator_url: ${_param:linux_system_repo_update_url}/elasticsearch-curator-5/
+ linux_system_repo_mcp_hotfix_elasticsearch_curator_url: ${_param:linux_system_repo_hotfix_url}/elasticsearch-curator-5/
+ #
+ linux_system_repo_mcp_elasticsearch_url: ${_param:linux_system_repo_url}/elasticsearch-${_param:elasticsearch_version}.x/
+ linux_system_repo_mcp_update_elasticsearch_url: ${_param:linux_system_repo_update_url}/elasticsearch-${_param:elasticsearch_version}.x/
+ linux_system_repo_mcp_hotfix_elasticsearch_url: ${_param:linux_system_repo_hotfix_url}/elasticsearch-${_param:elasticsearch_version}.x/
+ #
linux_system_repo_mcp_fluentd_url: ${_param:linux_system_repo_url}/td-agent/
+ linux_system_repo_mcp_update_fluentd_url: ${_param:linux_system_repo_update_url}/td-agent/
+ linux_system_repo_mcp_hotfix_fluentd_url: ${_param:linux_system_repo_hotfix_url}/td-agent/
#
linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
linux_system_repo_update_mcp_docker_url: ${_param:linux_system_repo_update_url}/docker/
diff --git a/linux/system/repo/mcp/apt_mirantis/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
index 09503a2..825b1c2 100644
--- a/linux/system/repo/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
@@ -7,5 +7,5 @@
mcp_fluentd:
source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_fluentd_url}/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
key: ${_param:linux_system_repo_mcp_fluentd_key}
- architectures: amd64
+ architectures: ${_param:linux_system_architecture}
clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es.yml
new file mode 100644
index 0000000..46913a0
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_elasticsearch_hotfix:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_hotfix_elasticsearch_url}/${_param:linux_system_codename} stable main"
+ key: ${_param:linux_system_repo_mcp_elasticsearch_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es_curator.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es_curator.yml
new file mode 100644
index 0000000..63d085f
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/es_curator.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_elasticsearch_curator_hotfix:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_hotfix_elasticsearch_curator_url}/${_param:linux_system_codename} stable main"
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
+ key: ${_param:linux_system_repo_mcp_elasticsearch_key}
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/init.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/init.yml
new file mode 100644
index 0000000..f17a85a
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.hotfix.elastic.es
+- system.linux.system.repo.mcp.apt_mirantis.hotfix.elastic.es_curator
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/fluentd.yml
new file mode 100644
index 0000000..b311896
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/fluentd.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.fluentd
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_fluentd_hotfix:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_hotfix_fluentd_url}/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
+ key: ${_param:linux_system_repo_mcp_fluentd_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml b/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml
index 02b3a8d..ceea50c 100644
--- a/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml
+++ b/linux/system/repo/mcp/apt_mirantis/mirantis_pining.yml
@@ -1,7 +1,7 @@
# This is global pin rule for all packages, provided by Mirantis.
# Quoting official man of apt:
# `Preferences are a strong power in the hands of a system administrator but they can become also their biggest nightmare if used without care!`
-# aka, don't change and dont' add any new rules, w\o extra neccecity.
+# aka, don't change and don't add any new rules, w\o extra neccecity.
parameters:
linux:
system:
diff --git a/linux/system/repo/mcp/apt_mirantis/update/elastic/es.yml b/linux/system/repo/mcp/apt_mirantis/update/elastic/es.yml
new file mode 100644
index 0000000..e4e958c
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/elastic/es.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_elasticsearch_update:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_update_elasticsearch_url}/${_param:linux_system_codename} stable main"
+ key: ${_param:linux_system_repo_mcp_elasticsearch_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/update/elastic/es_curator.yml b/linux/system/repo/mcp/apt_mirantis/update/elastic/es_curator.yml
new file mode 100644
index 0000000..51f3895
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/elastic/es_curator.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.elasticsearch
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_elasticsearch_curator_update:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_update_elasticsearch_curator_url}/${_param:linux_system_codename} stable main"
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true
+ key: ${_param:linux_system_repo_mcp_elasticsearch_key}
diff --git a/linux/system/repo/mcp/apt_mirantis/update/elastic/init.yml b/linux/system/repo/mcp/apt_mirantis/update/elastic/init.yml
new file mode 100644
index 0000000..bbc2b99
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/elastic/init.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.update.elastic.es
+- system.linux.system.repo.mcp.apt_mirantis.update.elastic.es_curator
diff --git a/linux/system/repo/mcp/apt_mirantis/update/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/update/fluentd.yml
new file mode 100644
index 0000000..ca9e95f
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/fluentd.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.fluentd
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_fluentd_update:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_update_fluentd_url}/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
+ key: ${_param:linux_system_repo_mcp_fluentd_key}
+ architectures: ${_param:linux_system_architecture}
+ clean_file: true