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)
(cherry picked from commit 94d704c5c921df2405a9cfb58d97fff331ba9e10)
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index b38a11c..44abc9d 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -8,22 +8,34 @@
# Global-hotfix
linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:mcp_version}/
# Per repos
- linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/
- linux_system_repo_mcp_ceph_url: ${_param:linux_system_repo_url}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/
- linux_system_repo_mcp_docker_legacy_url: ${_param:linux_system_repo_url}/docker-1.x/
- linux_system_repo_mcp_docker_url: ${_param:linux_system_repo_url}/docker/
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_extra_url: ${_param:linux_system_repo_url}/extra/
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_jenkins_url: ${_param:linux_system_repo_url}/jenkins/
+ 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_percona_url: ${_param:linux_system_repo_url}/percona/
- linux_system_repo_mcp_saltstack_url: ${_param:linux_system_repo_url}/saltstack-${_param:linux_system_repo_mcp_saltstack_version_number}/
linux_system_repo_mcp_fluentd_url: ${_param:linux_system_repo_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/
+ linux_system_repo_hotfix_mcp_docker_url: ${_param:linux_system_repo_hotfix_url}/docker/
+ #
+ linux_system_repo_mcp_ceph_url: ${_param:linux_system_repo_url}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/
+ linux_system_repo_update_mcp_ceph_url: ${_param:linux_system_repo_update_url}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/
+ linux_system_repo_hotfix_mcp_ceph_url: ${_param:linux_system_repo_hotfix_url}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/
+ #
+ linux_system_repo_mcp_percona_url: ${_param:linux_system_repo_url}/percona/
+ linux_system_repo_update_mcp_percona_url: ${_param:linux_system_repo_update_url}/percona/
+ linux_system_repo_hotfix_mcp_percona_url: ${_param:linux_system_repo_hotfix_url}/percona/
+ #
+ linux_system_repo_mcp_saltstack_url: ${_param:linux_system_repo_url}/saltstack-${_param:linux_system_repo_mcp_saltstack_version_number}/
+ linux_system_repo_update_mcp_saltstack_url: ${_param:linux_system_repo_update_url}/saltstack-${_param:linux_system_repo_mcp_saltstack_version_number}/
+ linux_system_repo_hotfix_mcp_saltstack_url: ${_param:linux_system_repo_hotfix_url}/saltstack-${_param:linux_system_repo_mcp_saltstack_version_number}/
+ #
+ linux_system_repo_mcp_extra_url: ${_param:linux_system_repo_url}/extra/
+ linux_system_repo_update_mcp_extra_url: ${_param:linux_system_repo_update_url}/extra/
+ linux_system_repo_hotfix_mcp_extra_url: ${_param:linux_system_repo_hotfix_url}/extra/
+ #
linux_system_repo_mcp_salt_url: ${_param:linux_system_repo_url}/salt-formulas/
linux_system_repo_update_mcp_salt_url: ${_param:linux_system_repo_update_url}/salt-formulas/
linux_system_repo_hotfix_mcp_salt_url: ${_param:linux_system_repo_hotfix_url}/salt-formulas/
@@ -41,9 +53,14 @@
linux_system_repo_hotfix_ubuntu_url: ${_param:linux_system_repo_hotfix_url}/ubuntu/
# Repo-component versions (if applicable)
- salt_version: 2017.7 # TODO should be deprecated after q4
+ salt_version: 2017.7 # TODO should be deprecated variable after 2018.q4
linux_system_repo_mcp_cassandra_version: '21x'
linux_system_repo_mcp_glusterfs_version_number: "3.8"
linux_system_repo_mcp_saltstack_version_number: "${_param:salt_version}"
linux_system_repo_mcp_ceph_codename: luminous
linux_repo_contrail_component: oc40
+
+ # Deprecated since 2018.11.
+ linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
+ linux_system_repo_mcp_jenkins_url: ${_param:linux_system_repo_url}/jenkins/
+ linux_system_repo_mcp_docker_legacy_url: ${_param:linux_system_repo_url}/docker-1.x/